it 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c01da0126bc0960aa7ab5e43f96517aa82eb289d
-  data.tar.gz: 1b98dfc90fa506312640cdbb7f900b3534c3d780
+  metadata.gz: 3afe5b083028e03d2498a736e5a7755b8729e5ed
+  data.tar.gz: 4f787ab01e824e5cf59864aa1b8ca7f9e4483a24
 SHA512:
-  metadata.gz: 6146d71238cef1aa408fd743d68e371bcf3fb91dde5e32e94249d236640229af060a8c83987df01f8dd14f76e7ae2a628744921689405499d3960a960e157925
-  data.tar.gz: 34b7df378be392ecd5fa29ee174be79be7031687c25cdbbebe4bab81e6063a05edaf194b8b9dc32e66ad0ab217733e5dc0353e7eeb97fc9b18e2a5bd8230f70c
+  metadata.gz: faaf1c0d1ac146c4ac6f78d1ef77a3604d749eada8886ffac8908d812a322f1496fe9f0b521d83eb1563ae39701d71cf3e875f4beda9e5403f2dd9ea65fc9498
+  data.tar.gz: 003d59a65094af75ccb9ffb6703bbd2373232c8668dddc4a14a11156adb37a658cff1b8fdf3fe550635cc2593a54de498560f9a6bdf3bc08e3d5d7ea4a0d92da

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-# Since 0.2.5
+# 1.0.0 (2017-06-03)
+
+* Allow whitespace after the colon without considering it part of the value [#20](https://github.com/iGEL/it/pull/20)  
+  *Russell Norris*
+* Run specs with warnings enabled
+* 1.0.0 Release to conform with semver 2.0
+
+# 0.8.0 (2015-06-12)
 
 * Make `It.plain` work with empty content [#14](https://github.com/iGEL/it/pull/14)  
   *Emil Sågfors*

data/README.md

@@ -2,10 +2,10 @@
 [![Build Status](http://img.shields.io/travis/iGEL/it/master.svg?style=flat)](https://travis-ci.org/iGEL/it)
 [![Coverage](http://img.shields.io/coveralls/iGEL/it/master.svg?style=flat)](https://coveralls.io/r/iGEL/it)
 [![Rubygems](http://img.shields.io/gem/v/it.svg?style=flat)](http://rubygems.org/gems/it)
-[![Github Issues](http://img.shields.io/github/issues/iGEL/it.svg?style=flat)](https://travis-ci.org/iGEL/it)
+[![Github Issues](http://img.shields.io/github/issues/iGEL/it.svg?style=flat)](https://github.com/iGEL/it/issues)
 [![Dependency Status](http://img.shields.io/gemnasium/iGEL/it.svg?style=flat)](https://gemnasium.com/iGEL/it)
 
-Tested against Ruby 2.2, 2.1, 2.0, head, rbx, and jruby and Rails 4.2, 4.1, and 3.2
+Tested against Ruby 2.4, 2.3, 2.2, head, and jruby 9.1.10.0 and Rails 5.1, 5.0, and 4.2
 
 What is **it**?
 =============

data/Rakefile

@@ -7,4 +7,4 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 Reek::Rake::Task.new
 
-task default: :spec
+task default: %i[spec rubocop reek]

data/it.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/igel/it'
   spec.license       = 'MIT'
 
-  spec.files         = %w(MIT-LICENSE README.md Rakefile Gemfile CHANGELOG.md it.gemspec) + Dir['lib/**/*.rb']
+  spec.files         = %w[MIT-LICENSE README.md Rakefile Gemfile CHANGELOG.md it.gemspec] + Dir['lib/**/*.rb']
   spec.require_paths = ['lib']
 
   spec.add_dependency 'actionpack', '>= 3.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'nokogiri'

data/lib/it/interpolation.rb

@@ -2,20 +2,37 @@ module It
   # Contains one interpolation and will delegate the work to the It::Tag (or subclass) or
   # ERB::Util.h
   class Interpolation
-    attr_accessor :key, :label, :value
+    class << self
+      def call(string, values)
+        key, label = extract_key_and_label_from(string)
+        value = values[key]
 
-    def initialize(string, values)
-      self.key, self.label = string[2..-2].split(':', 2)
-      validate_key_presence(values)
+        raise KeyError, "key{#{key}} not found" unless values.key?(key)
 
-      self.value = values[key]
-      convert_links
+        new(key, value, label).process
+      end
+
+      private
+
+      # This is a :reek:UtilityFunction, but it's not an instance method
+      def extract_key_and_label_from(string)
+        # eg: %{key:label} or %{key} or %{key: label}
+        string[2..-2].split(/:\s*/, 2)
+      end
+    end
+
+    def initialize(key, value, label)
+      @key = key
+      @value = value
+      @label = label
     end
 
     def process
+      convert_link
+
       validate_value_for_arguments
 
-      if value.is_a?(It::Tag) # Empty tag
+      if value.is_a?(It::Tag)
         process_it_tag
       else # Normal interpolations, as I18n.t would do it.
         ERB::Util.h(value)
@@ -24,10 +41,12 @@ module It
 
     private
 
+    attr_reader :key, :value, :label
+
     # Convert keys with String arguments into It::Links, if they are named link, link_* or *_link
-    def convert_links
+    def convert_link
       if key =~ /(\Alink\z|_link\z|\Alink_)/ && value.is_a?(String)
-        self.value = It::Link.new(value)
+        @value = It::Link.new(value)
       end
     end
 
@@ -39,13 +58,9 @@ module It
       end
     end
 
-    def validate_key_presence(values)
-      fail KeyError, "key{#{key}} not found" unless values.key?(key)
-    end
-
     def validate_value_for_arguments
       if label && !value.is_a?(It::Tag)
-        fail ArgumentError, "key{#{key}} has an argument, so it cannot resolved with a #{value.class}"
+        raise ArgumentError, "key{#{key}} has an argument, so it cannot resolved with a #{value.class}"
       end
     end
   end

data/lib/it/link.rb

@@ -3,9 +3,11 @@ module It
   class Link < Tag
     include ActionView::Helpers::UrlHelper
 
+    attr_reader :href
+
     # See It.link for details. You can do everything there and save 6 characters.
     def initialize(href, options = {})
-      fail TypeError, 'Invalid href given' unless [Hash, String].include?(href.class)
+      raise TypeError, 'Invalid href given' unless [Hash, String].include?(href.class)
 
       super(:a, options)
       @href = href
@@ -13,7 +15,7 @@ module It
 
     # Will be called from inside the helper to return the tag with the given content.
     def process(content)
-      link_to(content, @href, @options)
+      link_to(content, href, options)
     end
   end
 end

data/lib/it/parser.rb

@@ -1,17 +1,17 @@
 module It
   # Parses the string and replaces all interpolations accordingly.
   class Parser
-    attr_accessor :string, :options
+    attr_reader :string, :options
 
-    INTERPOLATION_REGEXP = /%\{[^{}}]+\}/
+    INTERPOLATION_REGEXP = /%\{[^{}]+\}/
 
     def self.backend_options(options)
       options.with_indifferent_access.slice(:default, :locale, :scope)
     end
 
     def initialize(string, options)
-      self.string = string
-      self.options = options
+      @string = string
+      @options = options
     end
 
     def process
@@ -21,7 +21,7 @@ module It
       # For deep nesting, we repeat the process until we have no interpolations anymore
       while contains_interpolation?
         string.gsub!(INTERPOLATION_REGEXP) do |interpolation|
-          Interpolation.new(interpolation, options).process
+          Interpolation.call(interpolation, options)
         end
       end
       string.html_safe
@@ -36,7 +36,7 @@ module It
     def handle_pluralization
       return if !string.is_a?(Hash) || !options.key?('count')
 
-      self.string = I18n.backend.send(:pluralize, locale, string, options['count'])
+      @string = I18n.backend.send(:pluralize, locale, string, options['count'])
     end
 
     def locale
@@ -44,7 +44,7 @@ module It
     end
 
     def escape_string
-      self.string = String.new(ERB::Util.h(string))
+      @string = String.new(ERB::Util.h(string))
     end
   end
 end

data/lib/it/plain.rb

@@ -2,7 +2,7 @@ module It
   # Handles replacements in non HTML templates (e.g. mails)
   class Plain < Tag
     def initialize(template = '%s')
-      fail TypeError, "expected a String, got #{template.class}" unless template.is_a?(String)
+      raise TypeError, "expected a String, got #{template.class}" unless template.is_a?(String)
 
       @template = template
     end

data/lib/it/tag.rb

@@ -7,8 +7,8 @@ module It
 
     # See It.tag for details. You can do everything there and save 6 characters.
     def initialize(tag_name, options = {})
-      fail TypeError, 'tag_name must be a String or Symbol' unless [String, Symbol].include?(tag_name.class)
-      fail TypeError, 'options must be a Hash' unless options.is_a?(Hash)
+      raise TypeError, 'tag_name must be a String or Symbol' unless [String, Symbol].include?(tag_name.class)
+      raise TypeError, 'options must be a Hash' unless options.is_a?(Hash)
 
       @tag_name = tag_name.to_sym
       @options = options.symbolize_keys

data/lib/it/version.rb

@@ -1,3 +1,3 @@
 module It
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: it
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Johannes Barre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A helper for links and other html tags in your translations