rails_dm_datastore 0.2.4 → 0.2.5

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gem.name = "rails_dm_datastore"
     gem.summary = %Q{Generators for dm on gae}
     gem.description = %Q{Integrate datamapper to Rails for the Google App Engine}
-    gem.email = "joshsmoore@gmail.com"
+    gem.email = ["joshsmoore@gmail.com", "woodie@netpress.com"]
     gem.homepage = "http://github.com/joshsmoore/dm-rails-gae"
-    gem.authors = ["joshsmoore"]
+    gem.authors = ["Josh S Moore", "John Woodell"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_dependency 'dm-core', DM_VERSION

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/generators/dd_model/templates/model.rb

@@ -1,25 +1,24 @@
-<% max = 2
-   presets = {'Text' => ':lazy => false', 'String' => ':length => 500'}
-   reserved_dm_names = DataMapper::Resource.instance_methods +
-                       DataMapper::Resource.private_instance_methods 
-   datastore_types = %w(AncestorKey BigDecimal Blob Boolean ByteString
-       Category Class Date DateTime Email Float Integer Key Link Object 
-       PhoneNumber PostalAddres Rating String Text Time TrueClass) -%>
-<% Array(attributes).each do |attribute|
-     if reserved_dm_names.include? attribute.name
-       raise "reserved property name '#{attribute.name}'"
-     elsif !datastore_types.include? attribute.type.to_s.classify
-       raise "unknown property type '#{attribute.type}'"
-     end
-     max = attribute.name.size if attribute.name.size > max -%>
-<% end -%>
 class <%= class_name %>
+<% max = 2
+  presets = {'Text' => ':lazy => false', 'String' => ':length => 500'}
+  reserved_dm_names = DataMapper::Resource.instance_methods +
+      DataMapper::Resource.private_instance_methods 
+  datastore_types  = (DataMapper::Property::PRIMITIVES +
+      DataMapper::Types.constants.map{|c| DataMapper::Types.const_get(c)}.
+      select{|t| t.respond_to? :primitive}).map {|c| c.to_s.split('::')[-1]}
+  Array(attributes).each do |attribute|
+    if reserved_dm_names.include? attribute.name
+      raise "reserved property name '#{attribute.name}'"
+    elsif !datastore_types.include? attribute.type.to_s.camelcase
+      raise "unknown property type '#{attribute.type}'"
+    end
+    max = attribute.name.size if attribute.name.size > max -%>
+  end -%>
   include DataMapper::Resource
   
   property :id,<%= " " * (max - 2) %> Serial
 <% Array(attributes).each do |attribute|
-     klass = attribute.type.to_s.classify.to_s
-     klass += 's' if klass.eql? 'PostalAddres' # classify bug
+     klass = attribute.type.to_s.camelcase
      more = presets.has_key?(klass) ? ", #{presets[klass]}" : ''
      pad = max - attribute.name.size
      rad = 13 - klass.size

data/lib/rails_dm_datastore.rb

@@ -4,160 +4,14 @@ require 'dm-ar-finders'
 require 'dm-timestamps'
 require 'dm-validations'
 DataMapper.setup(:default, "appengine://auto")
-#DataMapper.setup(:ephemeral, "in_memory::")
 
-#convert the date from the date picker to an actual date class that the datastore can actually store
-def fix_date(hash, property, type)
-  total_attributes = 0
-  if Date == type
-    total_attributes = 3
-  else
-    total_attributes = 5
-  end
-  
-  time_string = ""
-  1.upto(total_attributes) do |n|
-    if n == 1
-      time_string << hash[:"#{property}(#{n}i)"]
-    elsif n > 1 && n <= 3
-      time_string << '-' + hash[:"#{property}(#{n}i)"]
-    elsif n == 4
-      time_string << ' ' + hash[:"#{property}(#{n}i)"]
-    elsif n > 4
-      time_string << ':' + hash[:"#{property}(#{n}i)"]
-    end
-    hash.delete :"#{property}(#{n}i)"
-  end
-
-  hash[property] = type.parse(time_string).send("to_#{type.to_s.downcase}")
-  hash
-end
-
-module DataMapper
-  module Resource
-    alias :attributes_orig= :attributes=
-    # avoid object references in URLs
-    def to_param; id.to_s; end
-    # silence deprecation warnings
-    def new_record?; new?; end
-    # avoid NoMethodError
-    def update_attributes(*args); update(*args); end
-    
-    #make sure that all properties of the model that have to do with date or time are converted run through
-    # the fix_date converter
-    def attributes=(attributes)
-      self.class.properties.each do |t| 
-        if !(t.name.to_s =~ /.*_at/) && (t.type.to_s =~ /Date/ || t.type.to_s =~ /Time/ ) && 
-          attributes.include?("#{t.name.to_s}(1i)")
-          fix_date(attributes, t.name.to_s, t.type) 
-        end
-      end 
-      self.attributes_orig=(attributes)
-    end
-  end
-end
+require 'rails_dm_datastore/multiparameter_assignments'
+require 'rails_dm_datastore/data_mapper'
+require 'rails_dm_datastore/local_object_space'
+require 'rails_dm_datastore/extlib'
+require 'rails_dm_datastore/action_view'
+require 'rails_dm_datastore/active_support'
 
 # DataMapper::Validate
 class Dictionary; alias count length; end
- 
- 
- #Override Extlib::Hook::ClassMethods.inline_call to check in the given weak reference
-
-module LocalObjectSpace
-  def self.extended(klass)
-    (class << klass; self;end).send :attr_accessor, :hook_scopes
-   
-    klass.hook_scopes = []
-  end
-  
-  def object_by_id(object_id)
-    self.hook_scopes.each do |object|
-      return object if object.object_id == object_id
-    end
-  end
-  
-end
- 
-module Extlib
-  module Hook
-    module ClassMethods
-      
-      extend LocalObjectSpace
-        
-      #end
-      
-      def inline_call(method_info, scope)
-        Extlib::Hook::ClassMethods.hook_scopes << method_info[:from]
-        name = method_info[:name]
-        
-        if scope == :instance
-          args = method_defined?(name) && instance_method(name).arity != 0 ? '*args' : ''
-          %(#{name}(#{args}) if self.class <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
-        else
-          args = respond_to?(name) && method(name).arity != 0 ? '*args' : ''
-          %(#{name}(#{args}) if self <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
-        end
-      end
-    end
-  end
-end
-
-# makes the shorthand <%= render @posts %> work for collections of DataMapper objects
-module ActionView
-  module Partials
-  alias :render_partial_orig :render_partial
-  private
-  
-    def render_partial(options = {})
-      if DataMapper::Collection === options[:partial]
-        collection = options[:partial]
-        options[:partial] = options[:partial].first.class.to_s.tableize.singular
-        render_partial_collection(options.merge(:collection => collection))
-      else
-        render_partial_orig(options)      
-      end
-    end
-  
-  end
-end
-
-
-# provided by John Woodell mando.woodie@gmail.com to fix problems with date conversion
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module String #:nodoc:
-      # Converting strings to other objects
-      module Conversions
-        # 'a'.ord == 'a'[0] for Ruby 1.9 forward compatibility.
-        def ord
-          self[0]
-        end if RUBY_VERSION < '1.9'
-
-        # Form can be either :utc (default) or :local.
-        def to_time(form = :utc)
-          begin
-            ::Time.send("#{form}_time", *::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec).map { |arg| arg || 0 })
-          rescue
-            nil
-          end
-        end
-
-        def to_date
-          begin
-            ::Date.new(*::Date._parse(self, false).values_at(:year, :mon, :mday))
-          rescue
-            nil
-          end
-        end
 
-        def to_datetime
-          begin
-            ::DateTime.civil(*::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec).map { |arg| arg || 0 })
-          rescue
-            nil
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rails_dm_datastore/action_view.rb

@@ -0,0 +1,17 @@
+# makes the shorthand <%= render @posts %> work
+# for collections of DataMapper objects
+module ActionView
+  module Partials
+  alias :render_partial_orig :render_partial
+  private
+    def render_partial(options = {})
+      if DataMapper::Collection === options[:partial]
+        collection = options[:partial]
+        options[:partial] = options[:partial].first.class.to_s.tableize.singular
+        render_partial_collection(options.merge(:collection => collection))
+      else
+        render_partial_orig(options)
+      end
+    end
+  end
+end

data/lib/rails_dm_datastore/active_support.rb

@@ -0,0 +1,42 @@
+# set a nil date or time when a date cannot be parced
+# to avoid exception by ruby via to_date and to_time
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Converting strings to other objects
+      module Conversions
+        # 'a'.ord == 'a'[0] for Ruby 1.9 forward compatibility.
+        def ord
+          self[0]
+        end if RUBY_VERSION < '1.9'
+        # Form can be either :utc (default) or :local.
+        def to_time(form = :utc)
+          begin
+            ::Time.send("#{form}_time", *::Date._parse(self, false).
+                values_at(:year, :mon, :mday, :hour, :min, :sec).
+                map { |arg| arg || 0 })
+          rescue
+            nil
+          end
+        end
+        def to_date
+          begin
+            ::Date.new(*::Date._parse(self, false).
+                values_at(:year, :mon, :mday))
+          rescue
+            nil
+          end
+        end
+        def to_datetime
+          begin
+            ::DateTime.civil(*::Date._parse(self, false).
+                values_at(:year, :mon, :mday, :hour, :min, :sec).
+                map { |arg| arg || 0 })
+          rescue
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_dm_datastore/data_mapper.rb

@@ -0,0 +1,24 @@
+# Patch connections between DataMapper and Rails 2.3.5
+module DataMapper
+  module Resource
+    alias :attributes_orig= :attributes=
+    # avoid object references in URLs
+    def to_param; id.to_s; end
+    # silence deprecation warnings
+    def new_record?; new?; end
+    # avoid NoMethodError
+    def update_attributes(*args); update(*args); end
+
+    # make sure that all properties of the model that have to do with
+    # date or time are converted run through the fix_date converter
+    def attributes=(attributes)
+      self.class.properties.each do |t|
+        if !(t.name.to_s =~ /.*_at/) && (t.type.to_s =~ /Date|Time/ ) &&
+            attributes.include?("#{t.name.to_s}(1i)")
+          MultiparameterAssignments.fix_date(attributes, t.name.to_s, t.type)
+        end
+      end
+      self.attributes_orig=(attributes)
+    end
+  end
+end

data/lib/rails_dm_datastore/extlib.rb

@@ -0,0 +1,19 @@
+# Fix LocalObjectSpace hooks
+module Extlib
+  module Hook
+    module ClassMethods
+      extend LocalObjectSpace
+      def inline_call(method_info, scope)
+        Extlib::Hook::ClassMethods.hook_scopes << method_info[:from]
+        name = method_info[:name]
+        if scope == :instance
+          args = method_defined?(name) && instance_method(name).arity != 0 ? '*args' : ''
+          %(#{name}(#{args}) if self.class <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
+        else
+          args = respond_to?(name) && method(name).arity != 0 ? '*args' : ''
+          %(#{name}(#{args}) if self <= Extlib::Hook::ClassMethods.object_by_id(#{method_info[:from].object_id}))
+        end
+      end
+    end
+  end
+end

data/lib/rails_dm_datastore/local_object_space.rb

@@ -0,0 +1,14 @@
+# Override Extlib::Hook::ClassMethods.inline_call
+# to check in the given weak reference
+module LocalObjectSpace
+  def self.extended(klass)
+    (class << klass; self;end).send :attr_accessor, :hook_scopes
+    klass.hook_scopes = []
+  end
+
+  def object_by_id(object_id)
+    self.hook_scopes.each do |object|
+      return object if object.object_id == object_id
+    end
+  end
+end

data/lib/rails_dm_datastore/multiparameter_assignments.rb

@@ -0,0 +1,27 @@
+# Convert the values from the date and time picker
+# to a date or time class that the datastore can accept
+module MultiparameterAssignments
+  def self.fix_date(hash, property, type)
+    total_attributes = 0
+    if Date == type
+      total_attributes = 3
+    else
+      total_attributes = 5
+    end
+    time_string = ""
+    1.upto(total_attributes) do |n|
+      if n == 1
+        time_string << hash[:"#{property}(#{n}i)"]
+      elsif n > 1 && n <= 3
+        time_string << '-' + hash[:"#{property}(#{n}i)"]
+      elsif n == 4
+        time_string << ' ' + hash[:"#{property}(#{n}i)"]
+      elsif n > 4
+        time_string << ':' + hash[:"#{property}(#{n}i)"]
+      end
+      hash.delete :"#{property}(#{n}i)"
+    end
+    hash[property] = type.parse(time_string).send("to_#{type.to_s.downcase}")
+    hash
+  end
+end

data/rails_dm_datastore.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_dm_datastore}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["joshsmoore"]
-  s.date = %q{2010-02-08}
+  s.authors = ["Josh S Moore", "John Woodell"]
+  s.date = %q{2010-02-20}
   s.description = %q{Integrate datamapper to Rails for the Google App Engine}
-  s.email = %q{joshsmoore@gmail.com}
+  s.email = ["joshsmoore@gmail.com", "woodie@netpress.com"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,12 +23,17 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "dm-rails-gae.gemspec",
      "generators/dd_model/USAGE",
      "generators/dd_model/dd_model_generator.rb",
      "generators/dd_model/templates/model.rb",
      "generators/dd_model/templates/unit_test.rb",
      "lib/rails_dm_datastore.rb",
+     "lib/rails_dm_datastore/action_view.rb",
+     "lib/rails_dm_datastore/active_support.rb",
+     "lib/rails_dm_datastore/data_mapper.rb",
+     "lib/rails_dm_datastore/extlib.rb",
+     "lib/rails_dm_datastore/local_object_space.rb",
+     "lib/rails_dm_datastore/multiparameter_assignments.rb",
      "rails_dm_datastore.gemspec",
      "test/helper.rb",
      "test/test_dm-rails-gae.rb",
@@ -40,8 +45,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Generators for dm on gae}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_dm-rails-gae.rb",
+    "test/test_dm-rails-gae.rb",
+     "test/helper.rb",
      "test/test_weak_reference.rb"
   ]
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: rails_dm_datastore
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
-- joshsmoore
+- Josh S Moore
+- John Woodell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +08:00
+date: 2010-02-20 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +84,9 @@ dependencies:
         version: "0"
     version: 
 description: Integrate datamapper to Rails for the Google App Engine
-email: joshsmoore@gmail.com
+email: 
+- joshsmoore@gmail.com
+- woodie@netpress.com
 executables: []
 
 extensions: []
@@ -98,12 +101,17 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- dm-rails-gae.gemspec
 - generators/dd_model/USAGE
 - generators/dd_model/dd_model_generator.rb
 - generators/dd_model/templates/model.rb
 - generators/dd_model/templates/unit_test.rb
 - lib/rails_dm_datastore.rb
+- lib/rails_dm_datastore/action_view.rb
+- lib/rails_dm_datastore/active_support.rb
+- lib/rails_dm_datastore/data_mapper.rb
+- lib/rails_dm_datastore/extlib.rb
+- lib/rails_dm_datastore/local_object_space.rb
+- lib/rails_dm_datastore/multiparameter_assignments.rb
 - rails_dm_datastore.gemspec
 - test/helper.rb
 - test/test_dm-rails-gae.rb
@@ -137,6 +145,6 @@ signing_key:
 specification_version: 3
 summary: Generators for dm on gae
 test_files: 
-- test/helper.rb
 - test/test_dm-rails-gae.rb
+- test/helper.rb
 - test/test_weak_reference.rb

data/dm-rails-gae.gemspec

@@ -1,62 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dm-rails-gae}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["joshsmoore"]
-  s.date = %q{2010-01-08}
-  s.description = %q{Integrate datamapper to rails3 for the Google App Engine}
-  s.email = %q{joshsmoore@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dm-rails-gae.gemspec",
-     "generators/dm_model/dm_model_generator.rb",
-     "generators/dm_model/templates/model.rb",
-     "generators/dm_model/templates/unit_test.rb",
-     "lib/USAGE",
-     "lib/dm-rails-gae.rb",
-     "lib/generators/data_mapper/USAGE",
-     "lib/generators/data_mapper/model/model_generator.rb",
-     "lib/generators/data_mapper/model/templates/model.rb",
-     "lib/generators/data_mapper/templates/model.rb",
-     "test/helper.rb",
-     "test/test_dm-rails-gae.rb"
-  ]
-  s.homepage = %q{http://github.com/joshsmoore/dm-rails-gae}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Generators for dm on gae}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_dm-rails-gae.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
-end
-