betty_resource 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTdiYWZmNDY0OTZkNTQ3NDMwMTllMDM1YjkwMDkxMjA1YTNlY2Y0NA==
-  data.tar.gz: !binary |-
-    Mzc5NmIxMDg0NzUyNmExZWQxOTZkOGUyNjljNTRkOTRjNzZiMzJkOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YmIxNGMxNGUxNWQ1OGNlMjhiMDdmZjlmZTU2ZTkzZThhMjBkNzU3ODIzYjdh
-    NGI3ZjBmNWQyYzBiZjc1ZDNmZmM3ODMyYWQ4NmYwMDNjMmQ2ZDRjZDMxMDc0
-    NjEzOGFkOTU5NzVhMTI4MDg4YTM3NGJjOGMxYzg2MTYwYTU3ZjM=
-  data.tar.gz: !binary |-
-    OWE1MjE5NDI4ODRiY2VhMmU4ZjBlOGE5YTg0M2Q2MmI5ODBkNjU2NGYzZDVi
-    YWEyYTdmNmMzMWI3NWNkY2FhZjhkMjM3NTRmNDExNTMxOTUwYTJiOGVlMGM0
-    ZTFhYzIyNDYxNDc1YWMwYzczMzU2NGI1YTM1NGVkNGQxODQ1NTI=
+SHA1:
+  metadata.gz: cfa495aa7363146a42eed8058b57cb3c6ce730b4
+  data.tar.gz: ad3b006f15cf5825b317afe092a435913a3f0807
+SHA512:
+  metadata.gz: cf411c5cfe9e29b168c0043c774f353fe91a7cb75faafb3ae16935a4384593468f1bded2a8c2a274a898335840509c67fa46f8ad9a2bcdd81fd430b47dc921ce
+  data.tar.gz: f5bb929a910371dab0c0e54e0d99cb0bd5f8236358a3c3076c21adfa567f3ebff0ea4329cc9a68a6812674acd85d220b3a46950d9705e99bd3b882e7a31fc384

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 = BettyResource CHANGELOG
 
+=== 0.0.9 / 2013-05-14
+
+* 4 improvements:
+  * Improved belongs-to reliability
+  * Correct unit tests
+  * Normalize query strings as json
+  * Requiring 'mocha >= 0.13.3'
+
 === 0.0.8 / 2013-04-04
 
 * 1 feature:

data/Gemfile

@@ -10,6 +10,6 @@ end
 
 group :gem_test do
   gem "minitest"
-  gem "mocha", :require => "mocha/setup"
+  gem "mocha", ">= 0.13.3", :require => "mocha/setup"
   gem "simplecov", ">= 0.4.0"
 end

data/lib/betty_resource/api.rb

@@ -5,6 +5,8 @@ module BettyResource
     base_uri "#{BettyResource.config.host}/api"
     format :json
     basic_auth BettyResource.config.user, BettyResource.config.password
-
+    query_string_normalizer proc{|query|
+      query.to_json
+    }
   end
 end

data/lib/betty_resource/model.rb

@@ -19,6 +19,11 @@ module BettyResource
       properties.detect{|p|p.name == name.to_s}
     end
 
+    def typecast(key, value)
+      property = self.property(key)
+      property ? property.typecast(value) : value
+    end
+
     def attributes
       properties.collect(&:name)
     end

data/lib/betty_resource/model/property.rb

@@ -13,7 +13,14 @@ module BettyResource
         @id, @name, @kind, @options = id, name, kind, options
       end
 
-      # TODO: Clean this up as this is a dirty quick fix for loading belongs_to properties at the moment
+      def typecast(value)
+        if kind == "belongs_to" && id = value["id"]
+          model.get(id)
+        else
+          value
+        end
+      end
+
       def model
         BettyResource.meta_data.models.values.detect{|x| x.id == options["model"]} if kind == "belongs_to"
       end

data/lib/betty_resource/model/record.rb

@@ -1,3 +1,26 @@
+class DirtyHashy < HashWithIndifferentAccess
+
+  alias_method :regular_reader, :[]
+  def [](key, mapped = false)
+    typecasted(key) || set_typecasted(key, regular_reader(key, mapped))
+  end
+
+  protected
+
+  def typecasted(key)
+    instance_variable_get("@typecasted_#{key}")
+  end
+
+  def set_typecasted(key, value)
+    if @model
+      @model.typecast(key, value)
+    else
+      value
+    end
+  end
+
+end
+
 module BettyResource
   class Model
     class Record
@@ -17,6 +40,7 @@ module BettyResource
         @errors = {}
         super()
         self.attributes = Hash[model.attributes.collect{|x| [x, nil]}].merge attributes
+        self.attributes.instance_variable_set(:@model, model)
       end
 
       def new_record?
@@ -67,23 +91,6 @@ module BettyResource
 
     private
 
-      # TODO: Clean this mess up as this is a dirty quick fix for loading belongs_to properties at the moment
-      def method_missing(method, *args)
-        if method.to_s.match(/^(\w+).id=$/)
-          if model.attributes.include?($1)
-            instance = attributes[$1] ||= begin
-              if property = model.properties.detect{|x| x.name == $1}
-                property.model.new
-              end
-            end
-            if instance
-              return instance.instance_variable_set :@id, args.first
-            end
-          end
-        end
-        super
-      end
-
       def to_params
         {:body => {:record => attributes_as_json}}
       end

data/lib/betty_resource/version.rb

@@ -1,7 +1,7 @@
 module BettyResource
   MAJOR = 0
   MINOR = 0
-  TINY  = 8
+  TINY  = 9
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/unit/model/test_record.rb

@@ -12,7 +12,7 @@ module Unit
 
         it "should return its attributes" do
           relation = BettyResource::Relation.new
-          assert_equal %w(first_name id last_name), relation.attributes.keys.sort
+          assert_equal %w(first_name group id last_name), relation.attributes.keys.sort
         end
 
         it "should create a method for writing each attribute" do
@@ -58,7 +58,8 @@ module Unit
           assert_equal({"id" => nil, "first_name" => "Paul", "last_name" => "Engel"}, relation.as_json)
 
           relation = BettyResource::Relation.get(1)
-          assert_equal({"id" => 1, "first_name" => "Daniel", "last_name" => "Willemse"}, relation.as_json)
+          assert_equal({"id" => 1, "first_name" => "Daniel", "last_name" => "Willemse", "group"=>{"id"=>1}}, relation.as_json)
+          assert_equal({"id" => 1, "name" => "group one"}, relation.group.as_json)
         end
 
         it "should save itself" do
@@ -109,6 +110,24 @@ module Unit
           relation = BettyResource::Relation.get(relation.id)
           assert_equal "Stephan", relation.first_name
         end
+
+        it "should be able to fetch a belongs-to value" do
+          relation = BettyResource::Relation.get(1)
+          assert_equal 1, relation.group.id
+
+          filter = {
+            "operator" => "and",
+            "conditions" => [
+              "path" => [BettyResource::Relation.property(:id).id],
+              "predicate" => "eq",
+              "criteria" => 1
+            ]
+          }
+
+          relations = BettyResource::Relation.all(:filters => [filter])
+          assert_equal 1, relations.size
+          assert_equal 1, relations[0].group.id
+        end
       end
 
     end

data/test/unit/test_model.rb

@@ -11,7 +11,7 @@ module Unit
       end
 
       it "should know its attributes" do
-        assert_equal %w(first_name id last_name), BettyResource::Relation.attributes.sort
+        assert_equal %w(first_name group id last_name), BettyResource::Relation.attributes.sort
       end
 
       it "should return a new record instance" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: betty_resource
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chiel Wester
@@ -11,48 +11,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -73,28 +73,28 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Map Betty5 application resources to Ruby objects through the JSON API
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Map Betty5 application resources to Ruby objects