rails_dm_datastore 0.1.1 → 0.2.0

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'rake'
 
+RAILS_VERSION = "2.3.5"
+DM_VERSION = "0.10.2"
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -11,6 +14,13 @@ begin
     gem.homepage = "http://github.com/joshsmoore/dm-rails-gae"
     gem.authors = ["joshsmoore"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_dependency 'rails', RAILS_VERSION
+    gem.add_dependency 'dm-core', DM_VERSION
+    gem.add_dependency 'dm-ar-finders', DM_VERSION
+    gem.add_dependency 'dm-timestamps', DM_VERSION
+    gem.add_dependency 'dm-validations', DM_VERSION
+    gem.add_dependency 'dm-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.1.1
+0.2.0

data/generators/dm_model/templates/model.rb

@@ -1,25 +1,30 @@
-<% max = min = 10 -%>
+<% max = 2
+   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|
-  max = attribute.name.size if max < attribute.name.size
-  min = attribute.name.size if min > attribute.name.size
-
-  Array(DataMapper::Property::PRIMITIVES).collect{|i| i.to_s}|DataMapper::Types.constants
-  unless (Array(DataMapper::Property::PRIMITIVES).collect{|i| i.to_s}|DataMapper::Types.constants).include? attribute.type.to_s
-    raise "unknown property type '#{attribute.type}'"
-  end
-  
-  max += 1
-end
--%>
+     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 %>
   include DataMapper::Resource
   
-  property :id,<%= " " * (max - 2) %>Serial
-<% Array(attributes).each do |attribute| -%>
-  property :<%= attribute.name %>,<%= " " * (max - attribute.name.size) %><%= attribute.type %>
+  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
+     pad = max - attribute.name.size
+     rad = 13 - klass.size
+     %>  property :<%= attribute.name %>, <%= " " * pad
+     %><%= "#{klass}" %>, <%= " " * rad %>:nullable => false
 <% end -%>
 <% unless options[:skip_timestamps] -%>
-  property :created_at, <%= " " * (max - 11) %>DateTime
-  property :updated_at, <%= " " * (max - 11) %>DateTime
+  timestamps :at 
 <% end -%>
-end
+end

data/lib/rails_dm_datastore.rb

@@ -0,0 +1,39 @@
+# patch for -- dm-core 0.10.2 & rails 2.3.5
+require 'dm-core'
+require 'dm-ar-finders'
+require 'dm-timestamps'
+require 'dm-validations'
+DataMapper.setup(:default, "appengine://auto")
+
+module DataMapper
+  module Resource
+    # 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
+  end
+end
+
+# DataMapper::Validate
+class Dictionary; alias count length; end
+ 
+module Extlib
+  module Hook
+    module ClassMethods
+      def inline_call(method_info, scope)
+        name = method_info[:name]
+        if scope == :instance
+          args = method_defined?(name) &&
+              instance_method(name).arity != 0 ? '*args' : ''
+        else
+          args = respond_to?(name) &&
+              method(name).arity != 0 ? '*args' : ''
+        end
+        # ObjectSpace._id2ref should be replaced with WeakRef
+        %(#{name}(#{args})) # Always call hook... set_timestamps_on_save()
+      end
+    end
+  end
+end

data/rails_dm_datastore.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_dm_datastore}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["joshsmoore"]
@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
      "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",
+     "lib/rails_dm_datastore.rb",
      "rails_dm_datastore.gemspec",
      "test/helper.rb",
      "test/test_dm-rails-gae.rb"
@@ -53,11 +53,32 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.5"])
+      s.add_runtime_dependency(%q<dm-core>, ["= 0.10.2"])
+      s.add_runtime_dependency(%q<dm-ar-finders>, ["= 0.10.2"])
+      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"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<rails>, ["= 2.3.5"])
+      s.add_dependency(%q<dm-core>, ["= 0.10.2"])
+      s.add_dependency(%q<dm-ar-finders>, ["= 0.10.2"])
+      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"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<rails>, ["= 2.3.5"])
+    s.add_dependency(%q<dm-core>, ["= 0.10.2"])
+    s.add_dependency(%q<dm-ar-finders>, ["= 0.10.2"])
+    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"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_dm_datastore
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - joshsmoore
@@ -22,6 +22,76 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.3.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-ar-finders
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-timestamps
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-appengine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Integrate datamapper to rails3 for the Google App Engine
 email: joshsmoore@gmail.com
 executables: []
@@ -43,11 +113,11 @@ files:
 - 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
+- lib/rails_dm_datastore.rb
 - rails_dm_datastore.gemspec
 - test/helper.rb
 - test/test_dm-rails-gae.rb

data/lib/dm-rails-gae.rb

@@ -1,16 +0,0 @@
-# patch for -- dm-core 0.10.2 & rails 2.3.5
-
-module DataMapper
-  module Resource
-    # avoid object references in URLs
-    def to_param; id.to_s; end
-    # silence deprecation warnings
-    def new_record?; new?; end
-    def update_attributes(*args); update(*args); end
-  end
-end
-# DataMapper::Validate
-class Dictionary; alias count length; end
-
-# TODO: still need to fix this TypeError
-# compared with non class/module