morse_nameable 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17074da7e1534030f3cbda39540cd50687dac4f2
-  data.tar.gz: a5d906d8a0131199bcab20a271f5efd0db456738
+  metadata.gz: a5133693badd106b8dd679264457ee8f7be8b74d
+  data.tar.gz: 0ea6268c25aa1f8302e6a1925da2ee4049338871
 SHA512:
-  metadata.gz: 8787066f5d8f82fa4df9af1a512b83c6beea1e5e931d75f8dac135cf63a911f780ba785d8d5e83537028cd789576351535747ca7a22bc0a97476bbba632da601
-  data.tar.gz: 620de7d4c01f99f83655e4d147425b062fad75732127c36d47666965317da2ba5c57d5762f5381b868ce99ba80c6e36fa460deae85294e439d539106eb589d86
+  metadata.gz: 11c519c8a9fc832d2464fba1ffe81fe7d748d475256f5a005cf392a9a9342f10810b811a47c25aaabcf441699dab2ff9ef528f3988a571c2eed85561a3d78b52
+  data.tar.gz: 81307e0b9126b1156e28e6a88a07ebd9a55b5ffcaa9c730921b7f278a763706a0bec943e22132b2d9a0e0a6c5c5d02e2cdb1cbb6c3852151f1e47d03aa3825e0

data/lib/morse_nameable/version.rb

@@ -1,3 +1,3 @@
 module MorseNameable
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/morse_nameable.rb

@@ -1,4 +1,4 @@
 require 'active_model'
 require 'active_support/all'
 require 'morse_fields_validator'
-require "morse_nameable/nameable"
+require "nameable"

data/lib/nameable.rb

@@ -0,0 +1,39 @@
+module Nameable
+  extend ActiveSupport::Concern
+  include FieldsValidator
+
+  included do
+    validate_required_attributes
+  end
+
+  class_methods do
+    def required_attributes
+      result=defined?(super) ? super : []
+      result+=required_nameable_attributes
+    end
+
+    def required_database_fields
+      result=defined?(super) ? super : []
+      result+=[:firstname, :lastname]
+    end
+
+    def required_nameable_attributes
+      [:firstname,:lastname]
+    end
+  end
+
+  public
+
+  def full_name
+    "#{firstname} #{lastname}"
+  end
+
+  def proper_name
+    "#{lastname.upcase}, #{firstname}"
+  end
+
+  private
+
+
+end
+

data/morse_nameable.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "morse_fields_validator",">=1.0"
+  spec.add_dependency "morse_fields_validator","~>1.0"
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "coveralls", "~> 0.8"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morse_nameable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Terry S
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: morse_fields_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -142,8 +142,8 @@ files:
 - bin/console
 - bin/setup
 - lib/morse_nameable.rb
-- lib/morse_nameable/nameable.rb
 - lib/morse_nameable/version.rb
+- lib/nameable.rb
 - morse_nameable-1.0.0.gem
 - morse_nameable.gemspec
 homepage: https://github.com/morsedigital/morse_nameable

data/lib/morse_nameable/nameable.rb

@@ -1,28 +0,0 @@
-module Nameable
-  include FieldsValidator
-  extend ActiveSupport::Concern
-
-  included do
-    load_required_attributes(*%w{firstname lastname})
-    validate_required_attributes
-  end
-
-  public
-
-  def full_name
-    "#{firstname} #{lastname}"
-  end
-
-  def proper_name
-    "#{lastname.upcase}, #{firstname}"
-  end
-
-  private
-
-  def required_database_fields
-    result=defined?(super) ? super : []
-    result+=[:firstname, :lastname]
-  end
-
-end
-