iframely 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d85ce6fb09a8b3f3d37a9afd8ebe76cb0e8a690
-  data.tar.gz: d6767ac4f0be24979004f084c3f34152511b46f3
+  metadata.gz: 99ed3be38678e776627a35aa4fc57870ce0dd92c
+  data.tar.gz: cf99f8c301b374ff2c7f6b3779cb35452a753ee5
 SHA512:
-  metadata.gz: a1b2d3a45ca1cf95bd7237aec31d8616d459d9d77c7adcf9d36c343b2f39e463cceeb07d984b120691eef7c1a324a99e572531b6f37ca95b66c801293ea65eaa
-  data.tar.gz: 7618adc31fc435ef1382aaf3342d49b31a0b8fc0990c568748d853d68257a74d6869649127c67f75bd39f517c515ae6f7e67c30f821918e4fbffa4c986a079f1
+  metadata.gz: 2517be5c5d1d57199c597ab8b7c213cb87124b855b1f1557bd6de4450e292f7aa86f7558ccd02d25bad66d48685ad5f0f34e7a4fe4c093f530cfe579085e176a
+  data.tar.gz: de700e43c206848d2d0f1079851c7cef2cbf01d42e54c4892cb13e6496d776f8f4a068654b107d3e2433db4608766e7a4a130124644aa3dfffa0ca0bc6bc1226

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'faraday'
-gem 'hashie'
+gem 'hashie', '~> 2.0'
 
 #group :development do
   #gem 'minitest'

data/iframely.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'hashie'
+  spec.add_dependency 'hashie', '~> 2.0'
   spec.add_dependency 'faraday'
 
   spec.add_development_dependency "minitest"

data/lib/iframely/model.rb

@@ -2,12 +2,39 @@ require 'hashie'
 
 module Iframely
   class Model < Hashie::Dash
+
     property :id,   required: true
     property :url,  required: true
 
     property :meta
     property :links
 
-    property :html, required: true
+    property :rel
+
+    # Может не быть. Например по ссылке:
+    # https://github.com/imakewebthings/jquery-waypoints
+    property :html 
+
+    def self.build json
+      if json.is_a? Hash
+        if json.include?('error')
+          Iframely::ErrorModel.new json
+        else
+          new json
+        end
+      else
+        Iframely::ErrorModel.new error: 'no data'
+      end
+    rescue StandardError => e
+      Iframely::ErrorModel.new error: e.message
+    end
+
   end
+
+  class ErrorModel < Hashie::Dash
+    # Если он установлен, значит это ошибка и больше смотреть нечего
+    property :error, required: true
+  end
+
 end
+

data/lib/iframely/requester.rb

@@ -33,7 +33,7 @@ module Iframely
       if json.has_key? 'error'
         raise Iframely::Error, json['error']
       else
-        Iframely::Model.new  json
+        Iframely::Model.build json
       end
     end
 

data/lib/iframely/version.rb

@@ -1,3 +1,3 @@
 module Iframely
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: iframely
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Danil Pismenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -143,3 +143,4 @@ summary: iframe.ly ruby client
 test_files:
 - test/iframely_requester_test.rb
 - test/test_helper.rb
+has_rdoc: