harpy 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    harpy (0.4.0)
+    harpy (0.4.1)
       activemodel (>= 3.1.0)
       activesupport (>= 3.1.0)
       hash-deep-merge (~> 0.1.1)
@@ -11,21 +11,21 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
+    activesupport (3.2.1)
       i18n (~> 0.6)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
     hash-deep-merge (0.1.1)
     i18n (0.6.0)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mustache (0.99.4)
-    rake (0.8.7)
-    redcarpet (1.17.2)
+    rake (0.9.2.2)
+    redcarpet (2.1.0)
     rocco (0.8.2)
       mustache
       redcarpet
@@ -42,11 +42,10 @@ GEM
     yajl-ruby (0.8.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   harpy!
-  rake (~> 0.8.7)
+  rake (>= 0.8.7)
   rocco (~> 0.7)
   rspec (~> 2.6.0)

data/harpy.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("hash-deep-merge", ["~> 0.1.1"])
   s.add_runtime_dependency("yajl-ruby", ["~> 0.8.2"])
 
-  s.add_development_dependency("rake", ["~> 0.8.7"])
+  s.add_development_dependency("rake", [">= 0.8.7"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
   s.add_development_dependency("rocco", ["~> 0.7"])
 end

data/lib/harpy/resource.rb

@@ -122,130 +122,128 @@ module Harpy
       end
     end
 
-    module InstanceMethods
-      def initialize(attrs = nil)
-        @attrs = {}
-        self.attributes = attrs || {}
-      end
-
-      def attributes=(attrs)
-        attrs.each do |key, value|
-          if respond_to? "#{key}="
-            send "#{key}=", value
-          else
-            @attrs[key] = value
-          end
-        end
-      end
-      
-      def as_json(*args)
-        hash = @attrs.dup
-        hash.delete "link"
-        hash.delete "urn"
-        hash
-      end
-
-      def save
-        if valid?
-          _run_save_callbacks do
-            json = Yajl::Encoder.encode as_json
-            raise BodyToBig, "Size: #{json.bytesize} bytes (max 1MB)" if json.bytesize > 1.megabyte
-            persisted? ? update(json) : create(json)
-          end
+    def initialize(attrs = nil)
+      @attrs = {}
+      self.attributes = attrs || {}
+    end
+
+    def attributes=(attrs)
+      attrs.each do |key, value|
+        if respond_to? "#{key}="
+          send "#{key}=", value
         else
-          false
+          @attrs[key] = value
         end
       end
-      
-      def destroy
-        raise Harpy::UrlRequired unless url
-        _run_destroy_callbacks do
-          process_response Harpy.client.delete(url), :destroy
+    end
+    
+    def as_json(*args)
+      hash = @attrs.dup
+      hash.delete "link"
+      hash.delete "urn"
+      hash
+    end
+
+    def save
+      if valid?
+        _run_save_callbacks do
+          json = Yajl::Encoder.encode as_json
+          raise BodyToBig, "Size: #{json.bytesize} bytes (max 1MB)" if json.bytesize > 1.megabyte
+          persisted? ? update(json) : create(json)
         end
+      else
+        false
       end
-      
-      def link(rel)
-        link = (@attrs["link"]||[]).detect{|l| l["rel"]==rel.to_s}
-        link["href"] if link
+    end
+    
+    def destroy
+      raise Harpy::UrlRequired unless url
+      _run_destroy_callbacks do
+        process_response Harpy.client.delete(url), :destroy
       end
+    end
+    
+    def link(rel)
+      link = (@attrs["link"]||[]).detect{|l| l["rel"]==rel.to_s}
+      link["href"] if link
+    end
 
-      def url
-        link "self"
-      end
+    def url
+      link "self"
+    end
 
-      def url_collection
-        Harpy.entry_point.resource_url self.class.resource_name
-      end
+    def url_collection
+      Harpy.entry_point.resource_url self.class.resource_name
+    end
 
-      def id
-        @attrs["urn"].split(":").last if @attrs["urn"]
-      end
+    def id
+      @attrs["urn"].split(":").last if @attrs["urn"]
+    end
 
-      def persisted?
-        @attrs["urn"].present?
-      end
+    def persisted?
+      @attrs["urn"].present?
+    end
 
-      def inspect
-        "<#{self.class.name} @attrs:#{@attrs.inspect} @errors:#{errors.full_messages.inspect} persisted:#{persisted?}>"
-      end
+    def inspect
+      "<#{self.class.name} @attrs:#{@attrs.inspect} @errors:#{errors.full_messages.inspect} persisted:#{persisted?}>"
+    end
 
-      def has_key?(key)
-        @attrs.has_key? key.to_s
-      end
+    def has_key?(key)
+      @attrs.has_key? key.to_s
+    end
 
-      def hash
-        urn.hash
-      end
-      
-      def ==(other)
-        other.equal?(self) || (urn && other.instance_of?(self.class) && other.urn == urn)
-      end
-      alias_method :eql?, :==
+    def hash
+      urn.hash
+    end
+    
+    def ==(other)
+      other.equal?(self) || (urn && other.instance_of?(self.class) && other.urn == urn)
+    end
+    alias_method :eql?, :==
 
-    private
+  private
 
-      def create(json)
-        _run_create_callbacks do
-          process_response Harpy.client.post(url_collection, :body => json), :create
-        end
+    def create(json)
+      _run_create_callbacks do
+        process_response Harpy.client.post(url_collection, :body => json), :create
       end
+    end
 
-      def update(json)
-        _run_update_callbacks do
-          raise Harpy::UrlRequired unless url
-          process_response Harpy.client.put(url, :body => json), :update
-        end
+    def update(json)
+      _run_update_callbacks do
+        raise Harpy::UrlRequired unless url
+        process_response Harpy.client.put(url, :body => json), :update
       end
+    end
 
-      def process_response(response, context)
-        case response.code
-        when 200, 201, 302
-          @attrs.merge! Yajl::Parser.parse(response.body)
-          true
-        when 204
-          context==:create ? Harpy.client.invalid_code(response) : true
-        when 401
-          raise Harpy::Unauthorized, "Server returned a 401 response code"
-        when 422
-          Yajl::Parser.parse(response.body)["errors"].each do |attr, attr_errors|
-            attr_errors.each{|attr_error| errors[attr] = attr_error }
-          end
-          false
-        else
-          Harpy.client.invalid_code response
+    def process_response(response, context)
+      case response.code
+      when 200, 201, 302
+        @attrs.merge! Yajl::Parser.parse(response.body)
+        true
+      when 204
+        context==:create ? Harpy.client.invalid_code(response) : true
+      when 401
+        raise Harpy::Unauthorized, "Server returned a 401 response code"
+      when 422
+        Yajl::Parser.parse(response.body)["errors"].each do |attr, attr_errors|
+          attr_errors.each{|attr_error| errors[attr] = attr_error }
         end
+        false
+      else
+        Harpy.client.invalid_code response
       end
+    end
 
-      def method_missing(method, *args)
-        key = method.to_s
-        if persisted? && !@attrs.has_key?(key)
-          super
-        elsif key=~/[\]=]\z/
-          super
-        else
-          @attrs[key]
-        end
+    def method_missing(method, *args)
+      key = method.to_s
+      if persisted? && !@attrs.has_key?(key)
+        super
+      elsif key=~/[\]=]\z/
+        super
+      else
+        @attrs[key]
       end
     end
   end
-end
+end

data/lib/harpy/version.rb

@@ -1,3 +1,3 @@
 module Harpy
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harpy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70308967151200 !ruby/object:Gem::Requirement
+  requirement: &2156516020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70308967151200
+  version_requirements: *2156516020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70308967148440 !ruby/object:Gem::Requirement
+  requirement: &2156514400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308967148440
+  version_requirements: *2156514400
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70308967159800 !ruby/object:Gem::Requirement
+  requirement: &2156512580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308967159800
+  version_requirements: *2156512580
 - !ruby/object:Gem::Dependency
   name: hash-deep-merge
-  requirement: &70308975424920 !ruby/object:Gem::Requirement
+  requirement: &2156527640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308975424920
+  version_requirements: *2156527640
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70308975444760 !ruby/object:Gem::Requirement
+  requirement: &2156540080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,21 +66,21 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70308975444760
+  version_requirements: *2156540080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70308975452500 !ruby/object:Gem::Requirement
+  requirement: &2156536940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70308975452500
+  version_requirements: *2156536940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70308975454700 !ruby/object:Gem::Requirement
+  requirement: &2156534880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70308975454700
+  version_requirements: *2156534880
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &70308975467260 !ruby/object:Gem::Requirement
+  requirement: &2156547760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70308975467260
+  version_requirements: *2156547760
 description: Client for REST API with HATEOAS
 email:
 - joseph.halter@thetalentbox.com
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 289143157224719983
+      hash: -4195259765713612817
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 289143157224719983
+      hash: -4195259765713612817
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10