morse_contactable 0.1.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d7bf562e4d880da26fe6026ade18856886b565
-  data.tar.gz: 68d71aa237e32ce32f689e383932818e7637aa29
+  metadata.gz: 618732b3c9422f647d9d8c69b7e6847173a80199
+  data.tar.gz: b71d5c4b7639b1547324566559c422a237426a94
 SHA512:
-  metadata.gz: 064835ce46932afaffa643992ad7e45300842940c3202e5f5d1bd07ce2366a16670fd6efbcdeb1b5b0e035b48b10efeeafc4c9a800d6a5b3daf9f5944b77e8cc
-  data.tar.gz: ccfa55ec000dba178701f2e91430a65b1d3194ead40fa1274a9bf9ffed1b8d50fe5ecfd7e25f91952728a556ec49110b8c3c23b0bee62e78c6f2ef56915650ef
+  metadata.gz: 575c40e903337d86d9d16cbae1aec61f6514cbb93b114307b6b224d1e207ea1147aa37e561cbebc624b1351245673943ce7946e0d332e3e2bb6e18d38aab4b29
+  data.tar.gz: 43e0026f540f56f4f18b91967a69e6ce0b2d48adf87df43e84a1a3bac0fe8cbd41b8c660239a3c1864074bd87e3caacf75c68f93be51761b334aabdd4ee46f4c

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
-
 # Specify your gem's dependencies in morse_contactable.gemspec
 gemspec

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Terry S
+Copyright (c) 2015 fredmcgroarty
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -26,14 +26,16 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. 
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/morse_contactable/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/morse_contactable.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/addressable.rb

@@ -0,0 +1,55 @@
+module Addressable
+  extend ActiveSupport::Concern
+  include FieldsValidator
+
+  included do
+    validate_required_attributes
+  end
+
+  class_methods do
+    def required_attributes
+      result=defined?(super) ? super : []
+      result+=required_addressable_attributes
+    end
+
+    def required_database_fields
+      result=defined?(super) ? super : []
+      result+=[:address1, :address2, :address3, :town, :county, :country, :postcode]
+    end
+
+    def required_addressable_attributes
+      [:address1,:postcode]
+    end
+  end
+
+  public
+
+  def city
+    town
+  end
+
+  def city=(thing)
+    self.town = thing 
+  end
+
+  def state
+    county
+  end
+
+  def state=(thing)
+    self.county = thing 
+  end
+
+  def zipcode
+    postcode
+  end
+
+  def zipcode=(thing)
+    self.postcode = thing 
+  end
+
+  private
+
+
+end
+

data/lib/emailable.rb

@@ -0,0 +1,31 @@
+module Emailable
+  extend ActiveSupport::Concern
+  include FieldsValidator
+
+  included do
+    validate_required_attributes
+  end
+
+  class_methods do
+    def required_attributes
+      result=defined?(super) ? super : []
+      result+=required_emailable_attributes
+    end
+
+    def required_database_fields
+      result=defined?(super) ? super : []
+      result+=[:email]
+    end
+
+    def required_emailable_attributes
+      [:email]
+    end
+  end
+
+  public
+
+  private
+
+
+end
+

data/lib/morse_contactable/version.rb

@@ -1,3 +1,3 @@
 module MorseContactable
-  VERSION = "0.1.2"
+  VERSION = "1.0.2"
 end

data/lib/morse_contactable.rb

@@ -1,6 +1,10 @@
+require "morse_contactable/version"
 require 'active_model'
 require 'active_support/all'
-require "morse_contactable/version"
-require "morse_contactable/fields_validator"
-require "morse_contactable/contactable"
-
+require 'morse_fields_validator'
+require "addressable"
+require "emailable"
+require "phoneable"
+module MorseContactable
+  # Your code goes here...
+end

data/lib/phoneable.rb

@@ -0,0 +1,35 @@
+module Phoneable
+  extend ActiveSupport::Concern
+  include FieldsValidator
+
+  included do
+    validate_required_attributes
+  end
+
+  class_methods do
+    def required_attributes
+      result=defined?(super) ? super : []
+      result+=required_phoneable_attributes
+    end
+
+    def required_database_fields
+      result=defined?(super) ? super : []
+      result+=[:phone, :mobile]
+    end
+
+    def required_phoneable_attributes
+      [:phone]
+    end
+  end
+
+  public
+
+  def landline
+    phone
+  end
+
+  private
+
+
+end
+

data/morse_contactable.gemspec

@@ -6,14 +6,10 @@ require 'morse_contactable/version'
 Gem::Specification.new do |spec|
   spec.name          = "morse_contactable"
   spec.version       = MorseContactable::VERSION
-  spec.authors       = ["Terry S","Fred McGroarty"]
-  spec.email         = ["itsterry@gmail.com", 'freddymcgroarty@gmail.com']
+  spec.authors       = ["fredmcgroarty"]
+  spec.email         = ["mcfremac@icloud.com"]
 
-  if spec.respond_to?(:metadata)
-    #spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-
-  spec.summary       = %q{ Module to easily include contact fields in ActiveRecord models }
+  spec.summary       = %q{Module to allow easy contact functions in ActiveRecord models}
   spec.homepage      = "https://github.com/morsedigital/morse_contactable"
   spec.license       = "MIT"
 
@@ -21,12 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activemodel","~>4.2"
-  spec.add_dependency "activesupport","~>4.2"
+  spec.add_dependency "morse_fields_validator","~>1.0"
 
   spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "coveralls", "~> 0.8"
+  spec.add_development_dependency "guard-rspec", "~> 4.5"
+  spec.add_development_dependency "rb-fsevent", "~> 0.9"
   spec.add_development_dependency "shoulda-matchers", "~> 2.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-
 end

metadata

@@ -1,58 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: morse_contactable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.2
 platform: ruby
 authors:
-- Terry S
-- Fred McGroarty
+- fredmcgroarty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: morse_fields_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
+        version: '1.8'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -97,26 +124,27 @@ dependencies:
         version: '3.2'
 description: 
 email:
-- itsterry@gmail.com
-- freddymcgroarty@gmail.com
+- mcfremac@icloud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- lib/addressable.rb
+- lib/emailable.rb
 - lib/morse_contactable.rb
-- lib/morse_contactable/contactable.rb
-- lib/morse_contactable/fields_validator.rb
 - lib/morse_contactable/version.rb
+- lib/phoneable.rb
+- morse_contactable-1.0.1.gem
 - morse_contactable.gemspec
 homepage: https://github.com/morsedigital/morse_contactable
 licenses:
@@ -138,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Module to easily include contact fields in ActiveRecord models
+summary: Module to allow easy contact functions in ActiveRecord models
 test_files: []

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/lib/morse_contactable/contactable.rb

@@ -1,78 +0,0 @@
-module Contactable
-  VALIDATE_ADDRESSABLE = %w{address1 postcode}
-  VALIDATE_EMAILABLE = %w{email}
-  VALIDATE_PERSONABLE = ["firstname", "lastname"]
-  VALIDATE_PHONEABLE = %w{phone}
-  extend ActiveSupport::Concern
-  include FieldsValidator
-
-  def self.collect_attributes(klass,*_attrs)
-    _attrs.map { |rdf| klass.send(rdf.to_sym) }.compact
-  end
-
-  module Address
-    extend ActiveSupport::Concern
-    include FieldsValidator
-
-    REQUIRED_DATABASE_FIELDS = %w{address1 address2 address3 town county country postcode}
-
-    included do
-      validate_column_names(*REQUIRED_DATABASE_FIELDS)
-      load_required_attributes(*VALIDATE_ADDRESSABLE)
-    end
-    def contactable_address
-      Contactable.collect_attributes(self,*REQUIRED_DATABASE_FIELDS)
-    end
-  end
-
-  module Email 
-    extend ActiveSupport::Concern
-    include FieldsValidator
-
-    REQUIRED_DATABASE_FIELDS = %w{email}
-
-    included do
-      validate_column_names(*REQUIRED_DATABASE_FIELDS)
-      load_required_attributes(*VALIDATE_EMAILABLE)
-    end
-    def contactable_email
-      Contactable.collect_attributes(self,*REQUIRED_DATABASE_FIELDS)
-    end
-  end
-
-  module Person
-    extend ActiveSupport::Concern
-    include FieldsValidator
-
-    REQUIRED_DATABASE_FIELDS = %w{firstname lastname}
-
-    included do
-      validate_column_names(*REQUIRED_DATABASE_FIELDS)
-      load_required_attributes(*VALIDATE_PERSONABLE)
-    end
-    def contactable_person
-      Contactable.collect_attributes(self,*REQUIRED_DATABASE_FIELDS)
-    end
-  end
-  
-  module Phone
-    extend ActiveSupport::Concern
-    include FieldsValidator
-
-    REQUIRED_DATABASE_FIELDS = %w{phone mobile}
-
-    included do
-      validate_column_names(*REQUIRED_DATABASE_FIELDS)
-      load_required_attributes(*VALIDATE_PHONEABLE)
-    end
-    def contactable_phone
-      Contactable.collect_attributes(self,*REQUIRED_DATABASE_FIELDS)
-    end
-  end
-
-
-  include Address
-  include Email
-  include Person
-  include Phone
-end

data/lib/morse_contactable/fields_validator.rb

@@ -1,25 +0,0 @@
-module FieldsValidator 
-  ERROR = 'please ensure necessary fields are in place'
-
-  extend ActiveSupport::Concern
-  class_methods do 
-    def validate_required_attributes
-      required_attributes.each do |a|
-        validates a.to_sym, presence: true 
-      end
-    end
-    def load_required_attributes(*_attrs)
-      @required_attributes ||=[]
-      @required_attributes += _attrs
-      @required_attributes.uniq!
-    end
-
-    def required_attributes
-      @required_attributes
-    end
-
-    def validate_column_names(*_attrs)
-      _attrs.each { |rdf| raise "#{rdf} not included. #{ERROR}" unless column_names.include?(rdf)}
-    end
-  end
-end