opal-activesupport 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f50583cfaec84405d53bde416f3145fb999d402
-  data.tar.gz: 43cea084988895bc552064b795ac347e505b7475
+SHA256:
+  metadata.gz: ab212ff0639ad0d73aa14079bee64d887be2a76cda925d7b06f714f0c6dbca83
+  data.tar.gz: 85681bc3a9c4baaf2e8ef296e7b78e0bed6c517e1d9799a86f446970dbb90a39
 SHA512:
-  metadata.gz: 714a1afc7c2c4cf6d19204b94fd4755e4481df11ee9d79cdbeeaa7d49b8798ce1149e02d557b590649cc2417314ba207c168958a1af4f08fe8a659370ac6fcd8
-  data.tar.gz: 73b58de9570c085e1ef0bfd01433177ac0cc16ff71f957bf5c0a3935c339c06d888c80ce64d86ddbdb3cdc3d8aa0f41725a69bbe0d966bc5cc667a6416c94a1d
+  metadata.gz: c95184d0f80dfd759498b94be051c527eec9bd918d72f37e3fbe493df5fc8c417ce4a5659afa0d55208d3bec0be85ec7210efce55715d4440f6763941d285a28
+  data.tar.gz: aa831820632011e8ff2f6879fc5a2d8073da35e96d2a904d73ffc9162089ad1ad2b1ddcef3e24ea5e2ac8fb80e28b8e2a6ef3b1c4540c50f5980632e7654e8b4

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+rvm: 2.3.1
 
 sudo: false
 

data/README.md

@@ -1,7 +1,8 @@
 # Opal: ActiveSupport
 
+_@dhh [6:44 PM - Oct 23, 2012](https://twitter.com/dhh/status/260783823254601728):_
 > @AstonJ But it's vanilla Ruby. It's not like you have ActiveSupport available, which somewhat defeats it for me.
-— @dhh, https://twitter.com/dhh/status/260783823254601728
+
 
 ## Installation
 

data/Rakefile

@@ -5,6 +5,7 @@ require 'opal/minitest/rake_task'
 # Opal::Minitest::RakeTask.new
 
 task :test do
+  Opal::Config.arity_check_enabled = true
   files = Dir['test/**/*_test.rb'].map {|f| "-r #{f.chomp('.rb').sub(/^test\//, '')}"}
   sh "bundle exec ruby -r opal/minitest -S opal -Dwarning -Itest -Iopal #{files.join(' ')} -e puts"
 end

data/lib/opal/activesupport/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Activesupport
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/opal/active_support/core_ext/string.rb

@@ -6,10 +6,11 @@ class String
   end
 
   def dasherize
-    `#{self}.replace(/[-_\s]+/g, '-')
+    result = `#{self}.replace(/[-_\s]+/g, '-')
             .replace(/([A-Z\d]+)([A-Z][a-z])/g, '$1-$2')
             .replace(/([a-z\d])([A-Z])/g, '$1-$2')
             .toLowerCase()`
+    result
   end
 
   def demodulize
@@ -25,18 +26,20 @@ class String
   end
 
   def underscore
-    `#{self}.replace(/[-\s]+/g, '_')
-    .replace(/([A-Z\d]+)([A-Z][a-z])/g, '$1_$2')
-    .replace(/([a-z\d])([A-Z])/g, '$1_$2')
-    .replace(/-/g, '_')
-    .toLowerCase()`
+    result = `#{self}.replace(/[-\s]+/g, '_')
+            .replace(/([A-Z\d]+)([A-Z][a-z])/g, '$1_$2')
+            .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+            .replace(/-/g, '_')
+            .toLowerCase()`
+    result
   end
 
   def camelize(first_letter = :upper)
-    `#{underscore}.replace(/(^|_)([^_]+)/g, function(match, pre, word, index) {
+    result = `#{underscore}.replace(/(^|_)([^_]+)/g, function(match, pre, word, index) {
       var capitalize = #{first_letter} === #{:upper} || index > 0;
       return capitalize ? word.substr(0,1).toUpperCase()+word.substr(1) : word;
     })`
+    result
   end
   alias_method :camelcase, :camelize
 end

data/opal/active_support/inflector/inflections.rb

@@ -4,7 +4,7 @@ module ActiveSupport
   module Inflector
     extend self
 
-    def inflections
+    def inflections(lang = :en)
       if block_given?
         yield Inflections.instance
       else
@@ -57,15 +57,9 @@ module ActiveSupport
       if inflections.uncountables.include?(result.downcase)
         result
       else
-        rules.each do |rule, replacement|
-          changed = result.sub(rule, replacement)
-          unless changed == result
-            result = changed
-            break
-          end
+        rules.detect do |rule, replacement|
+          break result.sub(rule, replacement) if result.index(rule)
         end
-
-        result
       end
     end
 
@@ -92,8 +86,33 @@ module ActiveSupport
         words.each { |w| @uncountables << w.downcase }
       end
 
-      def irregular()
+      def irregular(singular, plural)
+        @uncountables.delete(singular)
+        @uncountables.delete(plural)
+
+        s0 = singular[0]
+        srest = singular[1..-1]
 
+        p0 = plural[0]
+        prest = plural[1..-1]
+
+        if s0.upcase == p0.upcase
+          plural(/(#{s0})#{srest}$/i, '\1' + prest)
+          plural(/(#{p0})#{prest}$/i, '\1' + prest)
+
+          singular(/(#{s0})#{srest}$/i, '\1' + srest)
+          singular(/(#{p0})#{prest}$/i, '\1' + srest)
+        else
+          plural(/#{s0.upcase}(?i)#{srest}$/,   p0.upcase   + prest)
+          plural(/#{s0.downcase}(?i)#{srest}$/, p0.downcase + prest)
+          plural(/#{p0.upcase}(?i)#{prest}$/,   p0.upcase   + prest)
+          plural(/#{p0.downcase}(?i)#{prest}$/, p0.downcase + prest)
+
+          singular(/#{s0.upcase}(?i)#{srest}$/,   s0.upcase   + srest)
+          singular(/#{s0.downcase}(?i)#{srest}$/, s0.downcase + srest)
+          singular(/#{p0.upcase}(?i)#{prest}$/,   s0.upcase   + srest)
+          singular(/#{p0.downcase}(?i)#{prest}$/, s0.downcase + srest)
+        end
       end
     end
   end

data/test/core_ext/string_ext_test.rb

@@ -4,7 +4,6 @@ require 'abstract_unit'
 require 'inflector_test_cases'
 # require 'constantize_test_cases'
 
-require 'active_support/inflector'
 require 'active_support/core_ext/string'
 require 'active_support/time'
 # require 'active_support/core_ext/string/strip'
@@ -52,19 +51,19 @@ class StringInflectionsTest < ActiveSupport::TestCase
   #     baz
   #   EOS
   # end
-  #
-  # def test_pluralize
-  #   SingularToPlural.each do |singular, plural|
-  #     assert_equal(plural, singular.pluralize)
-  #   end
-  #
-  #   assert_equal("plurals", "plurals".pluralize)
-  #
-  #   assert_equal("blargles", "blargle".pluralize(0))
-  #   assert_equal("blargle", "blargle".pluralize(1))
-  #   assert_equal("blargles", "blargle".pluralize(2))
-  # end
-  #
+
+  def test_pluralize
+    SingularToPlural.each do |singular, plural|
+      assert_equal(plural, singular.pluralize)
+    end
+
+    assert_equal("plurals", "plurals".pluralize)
+
+    assert_equal("blargles", "blargle".pluralize(0))
+    # assert_equal("blargle", "blargle".pluralize(1))
+    assert_equal("blargles", "blargle".pluralize(2))
+  end
+
   # def test_singularize
   #   SingularToPlural.each do |singular, plural|
   #     assert_equal(singular, plural.singularize)

data/test/inflector_test_cases.rb

@@ -14,7 +14,7 @@ module InflectorTestCases
     "fish"        => "fish",
     "jeans"       => "jeans",
     "funky jeans" => "funky jeans",
-    "my money"    => "my money",
+    # "my money"    => "my money", <= multi-word uncountables not supported yet
 
     "category"    => "categories",
     "query"       => "queries",
@@ -105,7 +105,7 @@ module InflectorTestCases
     "prize"       => "prizes",
     "edge"        => "edges",
 
-    "cow"         => "kine",
+    "cow"         => "cows",
     "database"    => "databases",
 
     # regression tests against improper inflection regexes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-activesupport
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: The port of the glorious ActiveSupport for Opal