irjudson-dm-persevere-adapter 0.0.2 → 0.9.0

data/README.txt

@@ -82,5 +82,4 @@ puts "Result: #{result}"
 == To Do:
 
 - Make a do-adapter for persevere.
-- Finish Query details (limit, order, etc)
 - Cleanup Documentation

data/Rakefile

@@ -13,7 +13,7 @@ require ROOT + 'lib/persevere_adapter/version'
 GEM_NAME    = 'dm-persevere-adapter'
 GEM_VERSION = DataMapper::PersevereAdapter::VERSION
 
-Hoe.new(GEM_NAME, GEM_VERSION) do |p|
+Hoe.spec(GEM_NAME) do |p|
   p.developer('Ivan R. Judson', 'irjudson [a] gmail [d] com')
 
   p.description = 'A DataMapper Adapter for persevere'
@@ -21,14 +21,14 @@ Hoe.new(GEM_NAME, GEM_VERSION) do |p|
   p.url = 'http://github.com/USERNAME/dm-persevere-adapter'
 
   p.clean_globs |= %w[ log pkg coverage ]
-  p.spec_extras = { 
-    :has_rdoc => true, 
+  p.spec_extras = {
+    :has_rdoc => true,
     :extra_rdoc_files => %w[ README.txt LICENSE.txt TODO History.txt ]
   }
 
   p.extra_deps = [
-    ['dm-core', "~> 0.9.10"], 
-    ['extlib', "~> 0.9.10"], 
+    ['dm-core', "~> 0.9.10"],
+    ['extlib', "~> 0.9.10"],
     ['persevere', "~> 1.0.0"]
   ]
 

data/lib/persevere_adapter.rb

@@ -1,6 +1,5 @@
-gem 'dm-core', '~> 0.9.10'
-require 'dm-core'
 require 'rubygems'
+require 'dm-core'
 require 'extlib'
 require 'json'
 require 'persevere'
@@ -52,7 +51,17 @@ module DataMapper
           # exceptions when there's a problem
 
           if response.code == "201"# good:
-            rh = JSON.parse(response.body)
+            rsrc_hash = JSON.parse(response.body)
+            # Typecast attributes, DM expects them properly cast
+            resource.model.properties.each do |prop|
+              value = rsrc_hash[prop.field.to_s]
+              if !value.nil?
+                rsrc_hash[prop.field.to_s] = prop.typecast(value)
+              end
+            end
+
+            resource.id = rsrc_hash["id"]
+
             created += 1
           else
             return false
@@ -82,14 +91,14 @@ module DataMapper
       # @api semipublic
       def update(attributes, query)
         updated = 0
-        puts "In Update A: #{attributes} Q: #{query.conditions.inspect}"
-        resources = read_many(query)
-        puts "Resources found: #{resources}"
-        resources.each do |resource|
-          key = resource.class.key(self.name).map do |property|
-            resource.instance_variable_get(property.instance_variable_name)
-          end
 
+        if ! query.is_a?(DataMapper::Query)
+          resources = [query].flatten
+        else
+          resources = read_many(query)
+        end
+
+        resources.each do |resource|
           tblname = Extlib::Inflection.classify(resource.class).pluralize
           path = "/#{tblname}/#{resource.id}"
 
@@ -120,7 +129,8 @@ module DataMapper
       # @api semipublic
 
       def read_one(query)
-        read_many(query)[0]
+        results = read_many(query)
+        results[0,1]
       end
 
       ##
@@ -137,8 +147,7 @@ module DataMapper
       # @api semipublic
       def read_many(query)
         resources = Array.new
-
-        json_query = make_json_query(query.conditions)
+        json_query = make_json_query(query)
 
         tblname = Extlib::Inflection.classify(query.model).pluralize
         path = "/#{tblname}/#{json_query}"
@@ -147,18 +156,22 @@ module DataMapper
 
         if response.code == "200"
           results = JSON.parse(response.body)
-          results.each do |result|
-            values = query.fields.collect do |field|
-              result[field.field.to_s]
+          results.each do |rsrc_hash|
+            # Typecast attributes, DM expects them properly cast
+            query.model.properties.each do |prop|
+              value = rsrc_hash[prop.field.to_s]
+              if !value.nil?
+                rsrc_hash[prop.field.to_s] = prop.typecast(value)
+              end
             end
-            resources << query.model.load(values, query)
           end
+
+          resources = query.model.load(results, query)
         else
           return false
         end
 
-        # Return results
-        resources
+        query.filter_records(resources)
       end
 
       alias :read :read_many
@@ -175,12 +188,14 @@ module DataMapper
       # @api semipublic
       def delete(query)
         deleted = 0
-        resources = read_many(query)
-        resources.each do |resource|
-          key = resource.class.key(self.name).map do |property|
-            resource.instance_variable_get(property.instance_variable_name)
-          end
 
+        if ! query.is_a?(DataMapper::Query)
+          resources = [query].flatten
+        else
+          resources = read_many(query)
+        end
+
+        resources.each do |resource|
           tblname = Extlib::Inflection.classify(resource.class).pluralize
           path = "/#{tblname}/#{resource.id}"
 
@@ -213,7 +228,23 @@ module DataMapper
 
       def initialize(name, uri_or_options)
         super
-        @persevere = Persevere.new(make_uri(uri_or_options))
+
+        if uri_or_options.class
+          @identity_maps = {}
+        end
+
+        @options = Hash.new
+
+        uri_or_options.each do |k,v|
+          @options[k.to_sym] = v
+        end
+
+        @options[:scheme] = @options[:adapter]
+        @options.delete(:scheme)
+
+        uri = URI::HTTP.build(@options).to_s
+
+        @persevere = Persevere.new(uri)
         @resource_naming_convention = NamingConventions::Resource::Underscored
         @identity_maps = {}
         @classes = []
@@ -235,22 +266,6 @@ module DataMapper
         end
       end
 
-      def make_uri(uri_or_options)
-        if uri_or_options.is_a?(String)
-          begin
-            URI.parse(uri_or_options)
-            return uri_or_options.to_s
-          rescue URI::InvalidURIError => e
-            puts "Error parsing persevere URI: ", e
-          end
-        elsif uri_or_options.is_a?(Hash)
-          nh = uri_or_options.dup
-          nh[:scheme] = nh[:adapter]
-          nh.delete(:scheme)
-          return URI::HTTP.build(nh).to_s
-        end
-      end
-
       ##
       # Convert a DataMapper Resource to a JSON.
       #
@@ -273,37 +288,41 @@ module DataMapper
       #
       # @api semipublic
 
-      def make_json_query(conditions)
+      def make_json_query(query)
         query_terms = Array.new
+
+        conditions = query.conditions
+
         conditions.each do |condition|
-          v = condition[1].typecast(condition[2])
-          if v.is_a?(String)
-            value = "'#{condition[2]}'"
-          else
-            value = "#{condition[2]}"
-          end
-          case condition[0]
-          when :eql
-            query_terms << "#{condition[1].field()}=#{value}"
-          when :lt
-            query_terms << "#{condition[1].field()}<#{value}"
-          when :gt
-            query_terms << "#{condition[1].field()}>#{value}"
-          when :lte
-            query_terms << "#{condition[1].field()}<=#{value}"
-          when :gte
-            query_terms << "#{condition[1].field()}=>#{value}"
-          when :not
-            query_terms << "#{condition[1].field()}!=#{value}"
-          when :like
-            if condition[2].is_a?(String)
-              query_terms << "#{condition[1].field()}~'*#{condition[2].to_s}*'"
+          operator, property, bind_value = condition
+          if ! property.nil? && !bind_value.nil?
+            v = property.typecast(bind_value)
+            if v.is_a?(String)
+              value = "'#{bind_value}'"
+            else
+              value = "#{bind_value}"
             end
-          else
-            puts "Unknown condition: #{condition[0]}"
+
+            query_terms << case operator
+                           when :eql then "#{property.field()}=#{value}"
+                           when :lt then  "#{property.field()}<#{value}"
+                           when :gt then  "#{property.field()}>#{value}"
+                           when :lte then "#{property.field()}<=#{value}"
+                           when :gte then "#{property.field()}=>#{value}"
+                           when :not then "#{property.field()}!=#{value}"
+                           when :like then "#{property.field()}~'*#{value}*'"
+                           else puts "Unknown condition: #{operator}"
+                           end
           end
         end
-        query = "?#{query_terms.join("&")}"
+
+        if query_terms.length != 0
+          query = "?#{query_terms.join("&")}"
+        else
+          query = ""
+        end
+
+        query
       end
     end
   end

data/lib/persevere_adapter/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module PersevereAdapter
-    VERSION = '0.0.2'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: irjudson-dm-persevere-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.9.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -42,7 +42,6 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 - LICENSE.txt
-- TODO
 - History.txt
 files: 
 - History.txt
@@ -50,7 +49,6 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- TODO
 - lib/persevere_adapter.rb
 - lib/persevere_adapter/version.rb
 - spec/integration/persevere_adapter_spec.rb