rails_dm_datastore 0.2.5 → 0.2.6

data/README.rdoc

@@ -12,6 +12,10 @@ Description goes here.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Build the gem
+  rake gemspec
+  rake build
+
 == Copyright
 
 Copyright (c) 2009 joshsmoore. See LICENSE for details.

data/Rakefile

@@ -19,6 +19,7 @@ begin
     gem.add_dependency 'dm-timestamps', DM_VERSION
     gem.add_dependency 'dm-validations', DM_VERSION
     gem.add_dependency 'dm-appengine'
+    gem.add_dependency 'rails_appengine'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/generators/dd_model/dd_model_generator.rb

@@ -3,6 +3,11 @@ require 'active_record'
 require 'dm-core'
  
 class DdModelGenerator < ModelGenerator
+
+  VALID_TYPES = %w{String ByteString Boolean Integer Float DateTime Date
+      Time List StringList Reference SelfReference BlobReference User Blob
+      Text Category Link Email GeoPt IM PhoneNumber PostalAddress Rating
+      AncestorKey Key Object Serial} # these last few are also valid
  
   def manifest
     record do |m|
@@ -15,10 +20,11 @@ class DdModelGenerator < ModelGenerator
       m.directory File.join('test/unit',  class_path)
  
       # Model class, unit test, and fixtures.
-      m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'unit_test.rb',  File.join('test/unit',  class_path, "#{file_name}_test.rb")
- 
+      m.template 'model.rb',
+          File.join('app/models', class_path, "#{file_name}.rb")
+      m.template 'unit_test.rb',
+          File.join('test/unit',  class_path, "#{file_name}_test.rb")
     end
   end
  
-end
+end

data/generators/dd_model/templates/model.rb

@@ -3,16 +3,13 @@ class <%= class_name %>
   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
+    elsif !DdModelGenerator::VALID_TYPES.include? attribute.type.to_s.camelcase
       raise "unknown property type '#{attribute.type}'"
     end
-    max = attribute.name.size if attribute.name.size > max -%>
+    max = attribute.name.size if attribute.name.size > max
   end -%>
   include DataMapper::Resource
   

data/lib/rails_dm_datastore.rb

@@ -5,12 +5,10 @@ require 'dm-timestamps'
 require 'dm-validations'
 DataMapper.setup(:default, "appengine://auto")
 
-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

data/rails_dm_datastore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_dm_datastore}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh S Moore", "John Woodell"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-03-01}
   s.description = %q{Integrate datamapper to Rails for the Google App Engine}
   s.email = ["joshsmoore@gmail.com", "woodie@netpress.com"]
   s.extra_rdoc_files = [
@@ -29,11 +29,9 @@ Gem::Specification.new do |s|
      "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",
@@ -42,11 +40,11 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.6}
   s.summary = %q{Generators for dm on gae}
   s.test_files = [
-    "test/test_dm-rails-gae.rb",
-     "test/helper.rb",
+    "test/helper.rb",
+     "test/test_dm-rails-gae.rb",
      "test/test_weak_reference.rb"
   ]
 
@@ -62,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-timestamps>, ["= 0.10.2"])
       s.add_runtime_dependency(%q<dm-validations>, ["= 0.10.2"])
       s.add_runtime_dependency(%q<dm-appengine>, [">= 0"])
+      s.add_runtime_dependency(%q<rails_appengine>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
@@ -70,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-timestamps>, ["= 0.10.2"])
       s.add_dependency(%q<dm-validations>, ["= 0.10.2"])
       s.add_dependency(%q<dm-appengine>, [">= 0"])
+      s.add_dependency(%q<rails_appengine>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-timestamps>, ["= 0.10.2"])
     s.add_dependency(%q<dm-validations>, ["= 0.10.2"])
     s.add_dependency(%q<dm-appengine>, [">= 0"])
+    s.add_dependency(%q<rails_appengine>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails_dm_datastore
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Josh S Moore
@@ -10,79 +15,113 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +08:00
+date: 2010-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-ar-finders
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: dm-timestamps
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: dm-validations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: dm-appengine
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rails_appengine
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id008
 description: Integrate datamapper to Rails for the Google App Engine
 email: 
 - joshsmoore@gmail.com
@@ -107,11 +146,9 @@ files:
 - 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
@@ -129,22 +166,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generators for dm on gae
 test_files: 
-- test/test_dm-rails-gae.rb
 - test/helper.rb
+- test/test_dm-rails-gae.rb
 - test/test_weak_reference.rb

data/lib/rails_dm_datastore/active_support.rb

@@ -1,42 +0,0 @@
-# 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/multiparameter_assignments.rb

@@ -1,27 +0,0 @@
-# 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