conred 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0b86d5fd3415a4d5d2756b5c38bdea98a74c6e
-  data.tar.gz: 57ee7497bbacc5da1241dd2ad9d5c1e05800d60d
+  metadata.gz: 268669e309b20e8ba1d0a39dfe6ea57f25946325
+  data.tar.gz: 51be5f10309e70418812ca217f0b3a38846bbe5f
 SHA512:
-  metadata.gz: c194befb2223405237b16e81a54003d080857064d61d473372749943e87b8007bc2bb73cd8a7e161876245f5142351b4727dbe1dc35ac8e4a7d86e921d614f26
-  data.tar.gz: 35cddb3230d5f6110fd7a4e72bdf55e4e2a898058965173f5dfbb9ebf21995b5bbcdb15c49dbceb017971a28250648d0679ac1114fd5589dcf6c5eadffa169bc
+  metadata.gz: 0ed74380d0975347418e92673cb9ad7edf40a1c8e3b02847a9a6ac15529e39a701ea9f48a6b44eb301ebd1028c415bee06f15fce91051f72e81987caaa0274f1
+  data.tar.gz: 1abb06d855338ef46b9e1e9c60706ac709d410d0fc66f9e0749676efded8dbb3b361150f2d7b7debeeff2f894dee980580ba4d2f6c20f8533b053ce0f8d77f2e

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in conred.gemspec
-gemspec
+gemspec

data/conred.gemspec

@@ -9,9 +9,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/janjiss/conred"
 
   gem.add_dependency "haml", '~> 3'
+  gem.add_dependency "typhoeus", '~> 0.6'
+  gem.add_dependency "actionpack", '~> 3'
   gem.add_development_dependency "rspec", '~> 2.0'
   gem.add_development_dependency "rake", '~> 10.1'
-  gem.add_development_dependency "actionpack", '~> 3'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/conred.rb

@@ -1,6 +1,3 @@
 require "conred/version"
-require "action_view"
-require "conred/helpers"
 require "conred/video"
-require "conred/links"
 require "haml"

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/conred/video.rb

@@ -1,6 +1,7 @@
 require "conred/version"
 require "action_view"
 require "net/http"
+require "typhoeus"
 module Conred
   module Video
     def initialize(arguments = {:width => 670, :height => 450, :error_message => "Video url you have provided is invalid"})
@@ -37,8 +38,8 @@ module Conred
     end
 
     def exist?
-      response = Net::HTTP.get_response(URI("https:#{api_uri}"))
-      response.is_a?(Net::HTTPSuccess)
+      response = Typhoeus.get("https:#{api_uri}")
+      response.code == 200
     end
 
     private

data/spec/conred_spec.rb

@@ -1,5 +0,0 @@
-require "conred"
-
-describe Conred do
-  
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conred
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Janis Miezitis
@@ -25,47 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '10.1'
 description: Gem to remove repetative tasks
 email:
 - janjiss@gmail.com
@@ -80,13 +94,10 @@ files:
 - Rakefile
 - conred.gemspec
 - lib/conred.rb
-- lib/conred/helpers.rb
-- lib/conred/links.rb
 - lib/conred/version.rb
 - lib/conred/video.rb
 - lib/views/video/video_iframe.html.haml
 - spec/conred_spec.rb
-- spec/conred_spec/helpers_spec.rb
 - spec/conred_spec/video_spec.rb
 homepage: http://github.com/janjiss/conred
 licenses: []
@@ -113,6 +124,5 @@ specification_version: 4
 summary: Comrades are for reusable code
 test_files:
 - spec/conred_spec.rb
-- spec/conred_spec/helpers_spec.rb
 - spec/conred_spec/video_spec.rb
 has_rdoc: 

data/lib/conred/helpers.rb

@@ -1,32 +0,0 @@
-require "conred/version"
-
-module Conred
-
-  module Helpers
-    
-    extend self
-
-    def action_view
-      @action_view ||= ActionView::Base.new
-    end
-
-    def sanitize_and_trim(text = "", word_count = nil, omission = '...')
-      text = action_view.strip_tags(text)
-      if word_count
-        action_view.truncate(text, :length => word_count, :omission => omission).to_s.html_safe
-      else
-        text.to_s.html_safe
-      end
-    end
-
-    def sanitize_body(text = "")
-      text = action_view.sanitize(text, :tags => %w(p a strong ul ol li blockquote strike u em), :attributes => %w(href))
-      text.to_s.html_safe
-    end
-
-    def external_url(link)
-      /^http/.match(link) ? link : "http://#{link}"
-    end
-  end
-
-end

data/lib/conred/links.rb

@@ -1,7 +0,0 @@
-module Conred
-
-  class Links
-
-  end
-  
-end

data/spec/conred_spec/helpers_spec.rb

@@ -1,31 +0,0 @@
-require "conred"
-
-describe Conred do
-  describe Conred::Helpers do
-
-    before do
-      @html_text = "<html><p>Paragraph text</p> <a href='http://google.com'>Link to some site</a></html>"
-    end
-
-    it "should return cleaned out text from html" do
-      Conred::Helpers.sanitize_and_trim(@html_text).should == "Paragraph text Link to some site"
-    end
-
-    it "should truncate string to fourteen symbols" do
-      Conred::Helpers.sanitize_and_trim(@html_text, 14).should == "Paragraph t..."
-    end
-
-    it "should use different truncate text at the ending of the line" do
-      Conred::Helpers.sanitize_and_trim(@html_text, 11, "").should == "Paragraph t"
-    end
-
-    it "should remove unallowed tags" do
-      Conred::Helpers.sanitize_body(@html_text).should == "<p>Paragraph text</p> <a href=\"http://google.com\">Link to some site</a>"
-    end
-
-    it "should add protocols in front of urls" do
-      Conred::Helpers.external_url("http://www.google.lv").should == "http://www.google.lv"
-      Conred::Helpers.external_url("www.google.lv").should == "http://www.google.lv"
-    end 
-  end
-end