namelessjon-dm-gen 0.2.5 → 0.3.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Jonathan Stott
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/dm_gen.rb

@@ -11,7 +11,7 @@ require 'templater'
 module DMGen
   extend Templater::Manifold
 
-  DM_VERSION = '0.9.11'
+  DM_VERSION = '0.10.0'
 
   desc <<-eos
     Generates files for the DataMapper ORM.

data/lib/templates/adapter/lib/%adapter_file%.rb

@@ -1,4 +1,3 @@
-gem 'dm-core', '~> <%= DMGen::DM_VERSION %>'
 require 'dm-core'
 
 module DataMapper
@@ -18,104 +17,81 @@ module DataMapper
       # each have a key that can be used to quickly look them up later without
       # searching, if the adapter supports it.
       #
-      # @param [Array<DataMapper::Resource>] resources
+      # @param [Enumerable(Resource)] resources
       #   The set of resources (model instances)
       #
-      # @return [Integer]
-      #   The number of records that were actually saved into the data-store
-      #
       # @api semipublic
       def create(resources)
         raise NotImplementedError
       end
 
       ##
-      # Used by DataMapper to update the attributes on existing records in a
-      # data-store: "UPDATE" in SQL-speak. It takes a hash of the attributes
-      # to update with, as well as a query object that specifies which resources
-      # should be updated.
-      #
-      # @param [Hash] attributes
-      #   A set of key-value pairs of the attributes to update the resources with.
-      # @param [DataMapper::Query] query
-      #   The query that should be used to find the resource(s) to update.
-      #
-      # @return [Integer]
-      #   the number of records that were successfully updated
+      # Looks up one record or a collection of records from the data-store:
+      # "SELECT" in SQL.
       #
-      # @api semipublic
-      def update(attributes, query)
-        raise NotImplementedError
-      end
-
-      ##
-      # Look up a single record from the data-store. "SELECT ... LIMIT 1" in SQL.
-      # Used by Model#get to find a record by its identifier(s), and Model#first
-      # to find a single record by some search query.
-      #
-      # @param [DataMapper::Query] query
-      #   The query to be used to locate the resource.
+      # @param [Query] query
+      #   The query to be used to seach for the resources
       #
-      # @return [DataMapper::Resource]
-      #   A Resource object representing the record that was found, or nil for no
-      #   matching records.
+      # @return [Array]
+      #   An Array of Hashes containing the key-value pairs for
+      #   each record
       #
       # @api semipublic
-      def read_one(query)
+      def read(query)
         raise NotImplementedError
       end
 
       ##
-      # Looks up a collection of records from the data-store: "SELECT" in SQL.
-      # Used by Model#all to search for a set of records; that set is in a
-      # DataMapper::Collection object.
-      #
-      # @param [DataMapper::Query] query
-      #   The query to be used to seach for the resources
+      # Used by DataMapper to update the attributes on existing records in a
+      # data-store: "UPDATE" in SQL-speak. It takes a hash of the attributes
+      # to update with, as well as a collection object that specifies which resources
+      # should be updated.
       #
-      # @return [DataMapper::Collection]
-      #   A collection of all the resources found by the query.
+      # @param [Hash] attributes
+      #   A set of key-value pairs of the attributes to update the resources with.
+      # @param [DataMapper::Collection] resources
+      #   The collection of resources to update.
       #
       # @api semipublic
-      def read_many(query)
+      def update(attributes, collection)
         raise NotImplementedError
       end
 
       ##
       # Destroys all the records matching the given query. "DELETE" in SQL.
       #
-      # @param [DataMapper::Query] query
-      #   The query used to locate the resources to be deleted.
+      # @param [DataMapper::Collection] resources
+      #   The collection of resources to delete.
       #
       # @return [Integer]
       #   The number of records that were deleted.
       #
       # @api semipublic
-      def delete(query)
+      def delete(collection)
         raise NotImplementedError
       end
 
       private
 
       ##
-      # Make a new instance of the adapter. The @model_records ivar is the 'data-store'
-      # for this adapter. It is not shared amongst multiple incarnations of this
-      # adapter, eg DataMapper.setup(:default, :adapter => :in_memory);
-      # DataMapper.setup(:alternate, :adapter => :in_memory) do not share the
-      # data-store between them.
-      #
+      # Make a new instance of the adapter.
+      # 
       # @param [String, Symbol] name
-      #   The name of the DataMapper::Repository using this adapter.
+      #   The name of the Repository using this adapter.
       # @param [String, Hash] uri_or_options
       #   The connection uri string, or a hash of options to set up
       #   the adapter
       #
       # @api semipublic
-      def initialize(name, uri_or_options)
+      def initialize(name, options = {})
         super
-        @identity_maps = {}
       end
 
-    end
-  end
-end
+    end # class <%= class_name %>
+
+    ##
+    #
+    # This can be used by plugins to trigger hooks for your adapter.
+    const_added(:<%= class_name %>)
+  end # module Adapters
+end # module DataMapper

data/lib/templates/adapter/spec/integration/%adapter_file%_spec.rb

@@ -1,6 +1,36 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
+
+# load up the shared specs.
+require 'dm-core/spec/adapter_shared_spec'
+
 describe 'DataMapper::Adapters::<%= class_name %>' do
+  before :all do
+    class ::Heffalump
+      include DataMapper::Resource
+
+      property :id,        Serial
+      property :name,      String
+      property :num_spots, Integer
+      property :striped,   Boolean
+    end
+
+    @model = Heffalump
+  end
+
+  supported_by :<%= snake_name %> do
+    before :all do
+      @model.all.destroy!
+
+      @heff1 = @model.create(:color => 'Black',     :num_spots => 0,   :striped => true)
+      @heff2 = @model.create(:color => 'Brown',     :num_spots => 25,  :striped => false)
+      @heff3 = @model.create(:color => 'Dark Blue', :num_spots => nil, :striped => false)
+
+      @string_property  = @model.color
+      @integer_property = @model.num_spots
+    end
 
+    it_should_behave_like 'An Adapter'
+  end
 end

data/lib/templates/one_file.rb

@@ -2,8 +2,6 @@
 #
 # A one file test to show ...
 require 'rubygems'
-
-gem('dm-core', '~> <%= DMGen::DM_VERSION %>')
 require 'dm-core'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: namelessjon-dm-gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jonathan Stott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: dm-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,69 +28,55 @@ executables:
 - dm-gen
 extensions: []
 
-extra_rdoc_files: []
-
-files: 
+extra_rdoc_files: 
+- LICENSE
 - README.rdoc
+files: 
 - CHANGELOG.rdoc
+- README.rdoc
 - bin/dm-gen
-- lib/templates
-- lib/templates/is
-- lib/templates/is/lib
-- lib/templates/is/lib/%gem_name%
-- lib/templates/is/lib/%gem_name%/is
-- lib/templates/is/lib/%gem_name%/is/%snake_name%.rb
-- lib/templates/is/lib/%gem_name%/is/version.rb
-- lib/templates/is/lib/%gem_name%.rb
-- lib/templates/is/History.txt
-- lib/templates/is/LICENSE
-- lib/templates/is/README.txt
-- lib/templates/is/TODO
-- lib/templates/is/spec
-- lib/templates/is/spec/integration
-- lib/templates/is/spec/integration/%snake_name%_spec.rb
-- lib/templates/is/spec/spec.opts
-- lib/templates/is/spec/spec_helper.rb
-- lib/templates/is/tasks
-- lib/templates/is/tasks/install.rb
-- lib/templates/is/tasks/spec.rb
-- lib/templates/is/Manifest.txt
-- lib/templates/is/Rakefile
-- lib/templates/adapter
+- lib/dm_gen.rb
+- lib/generators/adapter.rb
+- lib/generators/is.rb
+- lib/generators/one_file.rb
 - lib/templates/adapter/History.txt
 - lib/templates/adapter/LICENSE
 - lib/templates/adapter/Manifest.txt
 - lib/templates/adapter/README.txt
+- lib/templates/adapter/Rakefile
 - lib/templates/adapter/TODO
-- lib/templates/adapter/lib
-- lib/templates/adapter/lib/%adapter_file%
-- lib/templates/adapter/lib/%adapter_file%/version.rb
 - lib/templates/adapter/lib/%adapter_file%.rb
-- lib/templates/adapter/spec
-- lib/templates/adapter/spec/integration
+- lib/templates/adapter/lib/%adapter_file%/version.rb
 - lib/templates/adapter/spec/integration/%adapter_file%_spec.rb
 - lib/templates/adapter/spec/spec.opts
 - lib/templates/adapter/spec/spec_helper.rb
-- lib/templates/adapter/tasks
 - lib/templates/adapter/tasks/install.rb
 - lib/templates/adapter/tasks/spec.rb
-- lib/templates/adapter/Rakefile
+- lib/templates/is/History.txt
+- lib/templates/is/LICENSE
+- lib/templates/is/Manifest.txt
+- lib/templates/is/README.txt
+- lib/templates/is/Rakefile
+- lib/templates/is/TODO
+- lib/templates/is/lib/%gem_name%.rb
+- lib/templates/is/lib/%gem_name%/is/%snake_name%.rb
+- lib/templates/is/lib/%gem_name%/is/version.rb
+- lib/templates/is/spec/integration/%snake_name%_spec.rb
+- lib/templates/is/spec/spec.opts
+- lib/templates/is/spec/spec_helper.rb
+- lib/templates/is/tasks/install.rb
+- lib/templates/is/tasks/spec.rb
 - lib/templates/one_file.rb
-- lib/generators
-- lib/generators/one_file.rb
-- lib/generators/adapter.rb
-- lib/generators/is.rb
-- lib/dm_gen.rb
-- spec/is_plugin_spec.rb
-- spec/dm_gen_spec.rb
 - spec/adapter_spec.rb
-- spec/spec_helper.rb
+- spec/dm_gen_spec.rb
+- spec/is_plugin_spec.rb
 - spec/one_file_spec.rb
+- spec/spec_helper.rb
+- LICENSE
 has_rdoc: false
 homepage: http://github.com/namelessjon/dm-gen
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -113,5 +99,9 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Simple commandline tool for generating dm models
-test_files: []
-
+test_files: 
+- spec/is_plugin_spec.rb
+- spec/dm_gen_spec.rb
+- spec/adapter_spec.rb
+- spec/spec_helper.rb
+- spec/one_file_spec.rb