semantic_attributes 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f61914c744a168e768b8f1758b4a5105450c876
-  data.tar.gz: 4661dc4b0819fec9ba75f705cecf07693cebb766
+  metadata.gz: 171c2270aa742ab42f199d4898db3fff22a74391
+  data.tar.gz: 3c11f86efec71c907a53df0f7122ee34dfafcfd9
 SHA512:
-  metadata.gz: 42ff158e847d45e25336f827f77b248357cee54cdfb849ccc6060a5c4d6e0ff37ceab40e8785062e0f01332257b4a451e3a275b4b014481036f5ed120d004833
-  data.tar.gz: fe5f47dff95a3758c3a4a27988fff87221e6894a23187480ec02fc5dc7fc9d1bec496b6149f06998e95c69cd6a82263c0b06994039ac780c2345be74419a9b08
+  metadata.gz: abdf4b7ff9e57fec950ba63f24eb243470edc915bc1d4e538fb99caa8a18b67d33c5dd1ef8cd53ff7439fb06c42bd389936ffda75c459f51e77ff9d13b0d5b0e
+  data.tar.gz: e5697b5751cabbcb2f7b3ff572b624ba88cb0dccaab55a96e99cd5d460d11d53460c17198315f5fed856784a129ca003957d9ae8badf9bef2c8fc8e9971d8b7a

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
-
-gemspec
+source 'https://rubygems.org'
+
+gemspec

data/Rakefile

@@ -1,37 +1,10 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-require 'rake/testtask'
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the SemanticAttributes plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/unit/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the SemanticAttributes plugin.'
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SemanticAttributes'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('gist.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-Bundler::GemHelper.install_tasks
-
+require "bundler/gem_tasks"
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*test.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/lib/predicates/url.rb

@@ -7,7 +7,7 @@ require 'uri'
 #   :schemes [array, default ['http', 'https']] - a whitelist of allowed schemes. set to nil to allow all schemes.
 #   :ports [array, default nil] - a whitelist of allowed ports. set to nil to allow all ports.
 #   :allow_ip_address [boolean, default true] - whether to allow ip addresses instead to domain names.
-#   :implied_scheme [string, symbol, default 'http'] - what scheme to assume if non is present.
+#   :implied_scheme [string, symbol, default 'http'] - what scheme to assume if none is present.
 #
 # ==Examples
 #   # if you need an ftp url

data/lib/semantic_attributes/attribute_formats.rb

@@ -10,28 +10,6 @@ module SemanticAttributes #:nodoc:
       base.extend ClassMethods
     end
 
-    def respond_to?(method_name, *args)
-      if md = method_name.to_s.match(/_for_human$/) and semantic_attributes.include?(md.pre_match)
-        true
-      else
-        super
-      end
-    end
-
-    protected
-
-    def method_missing(method_name, *args, &block)
-      if md = method_name.to_s.match(/_for_human$/) and semantic_attributes.include?(md.pre_match)
-        self.class.humanize(md.pre_match, self.send(md.pre_match))
-      else
-        begin
-          super
-        rescue
-          raise $!, $!.to_s, caller
-        end
-      end
-    end
-
     module ClassMethods
       # converts the object into human format according to the predicates for the attribute.
       # the object may really be anything: string, integer, date, etc.
@@ -47,14 +25,15 @@ module SemanticAttributes #:nodoc:
 
       protected
 
-      def define_normalization_method_for(attr)
-        if Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new("4.0.4")
-          # Changes from Rails 4.0.4: https://github.com/rails/rails/commit/714634ad02b443ab51f8ef3ded324de411715d2a
-          self.define_attribute_methods if !@attribute_methods_generated
-        else
-          self.define_attribute_methods if self.respond_to? :attribute_methods_generated? and !self.attribute_methods_generated?
+      def define_humanization_method_for(attr)
+        ensure_attribute_methods_defined
+        define_method "#{attr}_for_human" do
+          self.class.humanize(attr, send(attr))
         end
+      end
 
+      def define_normalization_method_for(attr)
+        ensure_attribute_methods_defined
         writer = "#{attr}_with_normalization="
         old_writer = "#{attr}_without_normalization=".to_sym
         unless method_defined? writer
@@ -67,6 +46,14 @@ module SemanticAttributes #:nodoc:
         raise SemanticAttributes::MissingAttribute.new(attr)
       end
 
+      def ensure_attribute_methods_defined
+        if Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new("4.0.4")
+          # Changes from Rails 4.0.4: https://github.com/rails/rails/commit/714634ad02b443ab51f8ef3ded324de411715d2a
+          self.define_attribute_methods if !@attribute_methods_generated
+        else
+          self.define_attribute_methods if self.respond_to? :attribute_methods_generated? and !self.attribute_methods_generated?
+        end
+      end
     end
   end
 end

data/lib/semantic_attributes/predicates.rb

@@ -128,6 +128,7 @@ module SemanticAttributes
               args << options if options
               fields.each do |field|
                 # TODO: create a less sugary method that may be used programmatically and takes care of defining the normalization method properly
+                define_humanization_method_for field
                 define_normalization_method_for field
                 self.semantic_attributes[field].add *args
               end

data/lib/semantic_attributes/version.rb

@@ -1,3 +1,3 @@
-module SemanticAttributes
-  VERSION = "1.0.4"
-end
+module SemanticAttributes
+  VERSION = "1.0.5"
+end

data/test/test_helper.rb

@@ -1,67 +1,67 @@
-ENV["RAILS_ENV"] = "test"
-
-# load the support libraries
-require 'test/unit'
-require 'rubygems'
-require 'active_record'
-require 'active_record/fixtures'
-require 'active_support/time'
-
-# load the code-to-be-tested
-require 'semantic_attributes'
-
-Time.zone = 'UTC'
-
-# establish the database connection
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/db/database.yml'))
-ActiveRecord::Base.establish_connection('semantic_attributes_test')
-
-# capture the logging
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
-
-# load the schema ... silently
-ActiveRecord::Migration.verbose = false
-load(File.dirname(__FILE__) + "/db/schema.rb")
-
-# load the ActiveRecord models
-require File.dirname(__FILE__) + '/db/models'
-
-# configure the TestCase settings
-class SemanticAttributes::TestCase < ActiveSupport::TestCase
-  include ActiveRecord::TestFixtures
-  include PluginTestModels
-
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
-  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
-
-  fixtures :all
-end
-
-class ActiveRecord::Base
-  # Aids the management of per-test semantics.
-  #
-  # Examples:
-  #
-  # User.stub_semantics_with(:email => :email)
-  # User.stub_semantics_with(:email => [:email, :unique])
-  # User.stub_semantics_with(:email => {:length => {:above => 5}})
-  # User.stub_semantics_with(:email => [:email, {:length => {:above => 5}}])
-  def self.stub_semantics_with(attr_predicates = {})
-    semantics = SemanticAttributes::Set.new
-    attr_predicates.each do |attr, predicates|
-      [predicates].flatten.each do |predicate|
-        case predicate
-          when String, Symbol
-          semantics[attr].add(predicate)
-          when Hash
-          semantics[attr].add(predicate.keys.first, predicate.values.first)
-          else
-          raise '???'
-        end
-      end
-    end
-
-    self.stubs(:semantic_attributes).returns(semantics)
-  end
-end
+ENV["RAILS_ENV"] = "test"
+
+# load the support libraries
+require 'minitest/autorun'
+require 'rubygems'
+require 'active_record'
+require 'active_record/fixtures'
+require 'active_support/time'
+
+# load the code-to-be-tested
+require 'semantic_attributes'
+
+Time.zone = 'UTC'
+
+# establish the database connection
+ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/db/database.yml'))
+ActiveRecord::Base.establish_connection(:semantic_attributes_test)
+
+# capture the logging
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
+
+# load the schema ... silently
+ActiveRecord::Migration.verbose = false
+load(File.dirname(__FILE__) + "/db/schema.rb")
+
+# load the ActiveRecord models
+require File.dirname(__FILE__) + '/db/models'
+
+# configure the TestCase settings
+class SemanticAttributes::TestCase < ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  include PluginTestModels
+
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures  = false
+  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
+
+  fixtures :all
+end
+
+class ActiveRecord::Base
+  # Aids the management of per-test semantics.
+  #
+  # Examples:
+  #
+  # User.stub_semantics_with(:email => :email)
+  # User.stub_semantics_with(:email => [:email, :unique])
+  # User.stub_semantics_with(:email => {:length => {:above => 5}})
+  # User.stub_semantics_with(:email => [:email, {:length => {:above => 5}}])
+  def self.stub_semantics_with(attr_predicates = {})
+    semantics = SemanticAttributes::Set.new
+    attr_predicates.each do |attr, predicates|
+      [predicates].flatten.each do |predicate|
+        case predicate
+          when String, Symbol
+          semantics[attr].add(predicate)
+          when Hash
+          semantics[attr].add(predicate.keys.first, predicate.values.first)
+          else
+          raise '???'
+        end
+      end
+    end
+
+    self.stubs(:semantic_attributes).returns(semantics)
+  end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: semantic_attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Lance Ivy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.5
 description: A validation library for ActiveRecord models that allows introspection
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README
@@ -169,12 +169,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []