morph 0.3.6 → 0.3.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c12c6f354c52dd3e39c28ea48a9a6aaac2dea6b3
+  data.tar.gz: a56834d98a549d7a5e7b8a218bda2d0adb7a3acc
+SHA512:
+  metadata.gz: 521c12953766c73f27ef1409264b448d5fe76df0b236ecd9a6e6a1dc6cd2cf3bf6094e3f179f19d63f5ffbae1b17db785b5f372f19eab764fbe62f109382f5f6
+  data.tar.gz: e049d3f4e85e0510602886c090cc37ede43b8fdd1f1d18756f7cc110488c68afa1f7d2e3955b7934e88307377cedf18ee1d62ac6a85cfbc71279432701f28c6a

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.7. don't mix in private methods when Morph is included
+
 v0.3.6. call to_time() on XMLRPC::DateTime when setting it as an attribute value
 
 v0.3.5. retain morph_methods when inheriting class and parent both include Morph

data/README

@@ -147,7 +147,7 @@ So, a new company method has appeared:
 
 Time to generate an Active Record model? Get a sample script line like this:
 
- Hubbit.script_generate
+ Morph.script_generate(Hubbit)
 
  #=> "rails destroy model Hubbit;
  #    rails generate model Hubbit company:string email:string location:string
@@ -155,7 +155,7 @@ Time to generate an Active Record model? Get a sample script line like this:
 
 or specify the generator:
 
- Hubbit.script_generate :generator => 'rspec_model'
+ Morph.script_generate(Hubbit, :generator => 'rspec_model')
 
  #=> "rails destroy rspec_model Hubbit;
  #    rails generate rspec_model Hubbit company:string email:string

data/lib/morph.rb

@@ -18,7 +18,7 @@ rescue Exception => e
 end
 
 module Morph
-  VERSION = "0.3.6" unless defined? Morph::VERSION
+  VERSION = "0.3.7" unless defined? Morph::VERSION
 
   class << self
     def generate_migrations object, options={}
@@ -93,6 +93,15 @@ module Morph
       end
     end
 
+    def script_generate morphed_class, options={}
+      name = morphed_class.name.to_s.split('::').last
+      name = yield name if block_given?
+      generator = options[:generator] || 'model'
+      line = ["rails destroy #{generator} #{name}; rails generate #{generator} #{name}"]
+      morphed_class.morph_methods.select{|m| not(m =~ /=$/) }.each {|attribute| line << " #{attribute}:string"}
+      line.join('')
+    end
+
     def included(base)
       base.extend ClassMethods
       base.send(:include, InstanceMethods)
@@ -211,21 +220,10 @@ module Morph
       methods
     end
 
-    def adding_morph_method= true_or_false
-      @@adding_morph_method[self] = true_or_false
-    end
-
-    def class_def name, &block
-      class_eval { define_method name, &block }
-    end
-
-    def script_generate options={}
-      name = self.name.to_s.split('::').last
-      name = yield name if block_given?
-      generator = options[:generator] || 'model'
-      line = ["rails destroy #{generator} #{name}; rails generate #{generator} #{name}"]
-      morph_methods.select{|m| not(m =~ /=$/) }.each {|attribute| line << " #{attribute}:string"}
-      line.join('')
+    def add_morph_attribute attribute, *args
+      @@adding_morph_method[self] = true
+      class_eval "attr_accessor :#{attribute}"
+      @@adding_morph_method[self] = false
     end
 
     protected
@@ -251,7 +249,11 @@ module Morph
   module MethodMissing
     def method_missing symbol, *args
       is_writer = symbol.to_s =~ /=$/
-      is_writer ? morph_method_missing(symbol, *args) : super
+      if is_writer
+        Morph::InstanceMethods::Helper.morph_method_missing(self, symbol, *args)
+      else
+        super
+      end
     end
   end
 
@@ -280,7 +282,7 @@ module Morph
       if attributes_or_label.is_a? Hash
         attributes_or_label.each { |a, v| morph(a, v) }
       else
-        attribute = convert_to_morph_method_name(attributes_or_label)
+        attribute = Helper.convert_to_morph_method_name(attributes_or_label)
         send("#{attribute}=".to_sym, value)
       end
     end
@@ -305,39 +307,32 @@ module Morph
       end
     end
 
-    def morph_method_missing symbol, *args
-      attribute = symbol.to_s.chomp '='
-      if RUBY_VERSION >= "1.9"
-        attribute = attribute.to_sym
-      end
+    module Helper
 
-      if Object.instance_methods.include?(attribute)
-        raise "'#{attribute}' is an instance_method on Object, cannot create accessor methods for '#{attribute}'"
-      elsif argument_provided? args
-        base = self.class
-        base.adding_morph_method = true
+      def self.morph_method_missing object, symbol, *args
+        attribute = symbol.to_s.chomp '='
+        if RUBY_VERSION >= "1.9"
+          attribute = attribute.to_sym
+        end
 
-        if block_given?
-          yield base, attribute
-        else
-          # base.class_eval "attr_accessor :#{attribute}"
-          base.class_eval "def #{attribute}; @#{attribute}; end; def #{attribute}=(value); @#{attribute} = value; end"
-          send(symbol, *args)
+        if Object.instance_methods.include?(attribute)
+          raise "'#{attribute}' is an instance_method on Object, cannot create accessor methods for '#{attribute}'"
+        elsif Helper.argument_provided? args
+          base = object.class
+          base.add_morph_attribute attribute
+          object.send(symbol, *args)
         end
-        base.adding_morph_method = false
       end
-    end
 
-    private
-
-      def argument_provided? args
+      def self.argument_provided? args
         args.size > 0 && !args[0].nil? && !(args[0].is_a?(String) && args[0].strip.size == 0)
       end
 
-      def convert_to_morph_method_name label
+      def self.convert_to_morph_method_name label
         name = label.to_s.downcase.tr('()\-*',' ').gsub("'",' ').gsub('/',' ').gsub('%','percentage').strip.chomp(':').strip.gsub(/\s/,'_').squeeze('_')
         name = '_'+name if name =~ /^\d/
         name
       end
+    end
   end
 end

data/morph.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "morph"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
-  s.date = "2013-06-03"
+  s.date = "2014-02-24"
   s.description = "Morph mixin allows you to emerge Ruby class definitions from data via calling assignment methods.\n"
   s.email = ["rob ~@nospam@~ rubyforge.org"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README"]
@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Morph", "--main", "README", "--inline-source"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "morph"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.3"
   s.summary = "Morph mixin allows you to emerge class definitions via calling assignment methods."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])

metadata

@@ -1,68 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: morph
 version: !ruby/object:Gem::Version
-  version: 0.3.6
-  prerelease: 
+  version: 0.3.7
 platform: ruby
 authors:
 - Rob McKinnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: echoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Morph mixin allows you to emerge Ruby class definitions from data
-  via calling assignment methods.
-
-'
+description: |
+  Morph mixin allows you to emerge Ruby class definitions from data via calling assignment methods.
 email:
 - rob ~@nospam@~ rubyforge.org
 executables: []
@@ -81,7 +72,8 @@ files:
 - Rakefile
 homepage: https://github.com/robmckinnon/morph
 licenses: []
-post_install_message: ! 'Read usage examples at: https://github.com/robmckinnon/morph#readme'
+metadata: {}
+post_install_message: 'Read usage examples at: https://github.com/robmckinnon/morph#readme'
 rdoc_options:
 - --line-numbers
 - --inline-source
@@ -93,22 +85,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: morph
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Morph mixin allows you to emerge class definitions via calling assignment
   methods.
 test_files: []