snepo-dm-machinist 0.1.0 → 0.1.1

data/Rakefile

@@ -9,7 +9,7 @@ CLEAN.include '{log,pkg}/'
 
 spec = Gem::Specification.new do |s|
   s.name             = 'dm-machinist'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.platform         = Gem::Platform::RUBY
   s.has_rdoc         = true
   s.extra_rdoc_files = %w[ README LICENSE TODO ]

data/lib/dm-machinist/machinist.rb

@@ -15,16 +15,21 @@ module DataMapper
     end
     
     module DataMapperExtentions
+      
       def blueprint(&blueprint)
         @blueprint = blueprint
       end
   
       def make(attributes = {})
+        @saved = false
+        @reloaded = false
         raise "No blueprint for class #{self}" if @blueprint.nil?
         lathe = Lathe.new(self, attributes)
         lathe.instance_eval(&@blueprint)
         unless Machinist.nerfed?
-          lathe.object.save
+          unless lathe.object.save
+            raise "Error: #{lath.object.errors.inspect}"
+          end
           lathe.object.reload
         end
         returning(lathe.object) do |object|

data/lib/dm-machinist.rb

@@ -19,6 +19,30 @@ class Object
     value
   end
 end
+class String
+  # Ripped from Rails Inflectors
+  def camelize(first_letter_in_uppercase = true)
+    lower_case_and_underscored_word = self
+    if first_letter_in_uppercase
+      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    else
+      lower_case_and_underscored_word.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+    end
+  end
+  
+  # Ripped from Rails Inflectors
+  def constantize
+    camel_cased_word = self
+    names = camel_cased_word.split('::')
+    names.shift if names.empty? || names.first.empty?
+
+    constant = Object
+    names.each do |name|
+      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+    end
+    constant
+  end
+end
  
 # Include the plugin in Resource
 module DataMapper

data/spec/data/comment.rb

@@ -1,5 +1,6 @@
 class Comment
   include DataMapper::Resource
+  
   property :id, Serial
   property :author, String
   property :body, Text

data/spec/dm_machinist_spec.rb

@@ -29,7 +29,7 @@ describe "Machinist" do
     end
 
     def negative_failure_message
-      "expected the object not to be saved but is is"
+      "expected the object not to be saved but it is"
     end
   end
   
@@ -40,7 +40,7 @@ describe "Machinist" do
   # class BeReloaded
   #   def matches?(target)
   #     @target = target
-  #     @target.methods.each{|m| p m}
+  #     TODO: Work out how to assert this...
   #   end
   #   
   #   def failure_message
@@ -127,7 +127,7 @@ describe "Machinist" do
   
   it "should not nerf make within a block passed to make_unsaved" do
     comment = nil
-    post = Post.make_unsaved do |post|
+    post = Post.make_unsaved(:title => "foo") do |post|
       comment = Comment.make(:post => post)
     end
     post.should_not be_saved

data/spec/spec_helper.rb

@@ -5,10 +5,6 @@ require 'pathname'
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-machinist'
 require Pathname(__FILE__).dirname.expand_path / 'helpers'
 
-Spec::Runner.configure do |config|
-  config.include(CustomMatchers)
-end
-
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: snepo-dm-machinist
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Cameron Barrie
@@ -38,7 +38,6 @@ files:
 - spec/data/comment.rb
 - spec/data/post.rb
 - spec/dm_machinist_spec.rb
-- spec/helpers.rb
 - spec/sham_spec.rb
 - spec/spec_helper.rb
 - spec/spec.opts

data/spec/helpers.rb

@@ -1,46 +0,0 @@
-class String
-  # Ripped from Rails Inflectors
-  def camelize(first_letter_in_uppercase = true)
-    lower_case_and_underscored_word = self
-    if first_letter_in_uppercase
-      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-    else
-      lower_case_and_underscored_word.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
-    end
-  end
-  
-  # Ripped from Rails Inflectors
-  def constantize
-    camel_cased_word = self
-    names = camel_cased_word.split('::')
-    names.shift if names.empty? || names.first.empty?
-
-    constant = Object
-    names.each do |name|
-      constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-    end
-    constant
-  end
-end
-module CustomMatchers
-  class DataMapperBeSaved
-    def initialize(expected)
-      @expected = expected
-    end
-
-    def matches?(target)
-      @target = target
-      p @target
-      p @expected
-      #satisfy expectation here
-    end
-
-    def failure_message
-      "expected #{@expected} but got #{@target}"
-    end
-
-    def negative_failure_message
-      "expected #{@expected} to not be #{@target}"
-    end
-  end
-end