RubyGems - green_monkey - Versions diffs - 0.2.2 → 0.3.0 - Mend

green_monkey 0.2.2 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

checksums.yaml +4 -4
data/.gitignore +2 -1
data/.travis.yml +13 -9
data/Gemfile +1 -1
data/Gemfile.lock +115 -99
data/{Gemfile.rails-4.1 → Gemfile.rails-4.2} +1 -1
data/{Gemfile.rails-3.2 → Gemfile.rails-5} +1 -1
data/{Gemfile.rails-3.0 → Gemfile.rails-5.1} +1 -1
data/README.md +1 -1
data/green_monkey.gemspec +1 -1
data/lib/green_monkey/ext/action_view.rb +36 -10
data/lib/green_monkey/ext/haml.rb +8 -4
data/lib/green_monkey/ext/view_helper.rb +5 -1
data/spec/action_view_spec.rb +2 -2
data/spec/spec_helper.rb +11 -3
metadata +6 -9
data/Gemfile.haml-edge +0 -5
data/Gemfile.rails-3.1 +0 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71723243b4198578e8829ba40311d49e664eacb9
-  data.tar.gz: 864478d04cfb3d38db351637a6b96ab387243296
+  metadata.gz: '0686362a0baec8b14b634d22298877bbb8b63666'
+  data.tar.gz: 383b6a17e8472a5b35322abb8033dbcd67d5638d
 SHA512:
-  metadata.gz: dff149c920359926f50be0fc9cca4dd1edc7ed91e3c30d0ef274ae66773788bb43eaa8fb426400b0dab066ef06f5bcc2cb1fbcdb5a58119df4c604ea3f201a47
-  data.tar.gz: 273e90777f8909d268f511d58c1c8c19aeda0e16b55f0deee778347faca7377042585c13a350fbbb1a25290fbe616afdf1aa2b3292ae6645996693c54d4900f3
+  metadata.gz: 50e16fb4529936568fba250d98f5586c4aa7084dd0ad314a4dbbff85a145991894b2557c35695c00bc1a9937059339c95d02632b7c930883f5a8e63d45ce4a5e
+  data.tar.gz: 7c8add2f508a3307f36ce4451b1539b7b29da6d1345720fa5708e16614b5e53c9c8c4ff43adda7b5942be9674c9d380dba5fe8bd371246f8e803563e4ba562ef

data/.gitignore CHANGED

@@ -2,4 +2,5 @@
 tmp/*.haml
 tmp/rails/log
-Gemfile.*.lock
+Gemfile.*.lock
+.ruby-version

data/.travis.yml CHANGED

@@ -1,11 +1,15 @@
-script: "bundle exec rake"
+language: ruby
+script: rake
+install: bundle install --jobs=3 --retry=5
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 gemfile:
-  - Gemfile.rails-3.0
-  - Gemfile.rails-3.1
-  - Gemfile.rails-3.2
-  - Gemfile.rails-4.1
-  - Gemfile.haml-edge
+  - Gemfile.rails-4.2
+  - Gemfile.rails-5.0
+  - Gemfile.rails-5.1

data/Gemfile CHANGED

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec
-gem "rails", "4.2.0.beta1"
+gem "rails", "5.1.0"

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    green_monkey (0.2.2)
+    green_monkey (0.3.0)
       chronic_duration
       haml (>= 3.1.0)
       mida_vocabulary (>= 0.2.2)
@@ -9,125 +9,138 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.beta1)
-      actionpack (= 4.2.0.beta1)
-      actionview (= 4.2.0.beta1)
+    actioncable (5.1.0)
+      actionpack (= 5.1.0)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    actionpack (4.2.0.beta1)
-      actionview (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
-      rack (~> 1.6.0.beta)
-      rack-test (~> 0.6.2)
-      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    actionview (4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    activejob (4.2.0.beta1)
-      globalid (>= 0.2.3)
-    activemodel (4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
-      builder (~> 3.1)
-    activerecord (4.2.0.beta1)
-      activemodel (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.beta1)
-      i18n (>= 0.7.0.beta1, < 0.8)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.0)
+      activesupport (= 5.1.0)
+      globalid (>= 0.3.6)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (6.0.0.beta1)
+    arel (8.0.0)
     blankslate (3.1.3)
-    builder (3.2.2)
+    builder (3.2.3)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.2.3)
-      activesupport (>= 4.1.0)
-    haml (4.0.5)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    erubi (1.6.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    haml (5.0.1)
+      temple (>= 0.8.0)
       tilt
-    hike (1.2.3)
-    i18n (0.7.0.beta1)
-    json (1.8.1)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
+    i18n (0.8.1)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.5)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mida_vocabulary (0.2.2)
       blankslate (~> 3.1)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    minitest (5.4.1)
-    multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
     numerizer (0.1.1)
-    rack (1.6.0.beta)
-    rack-test (0.6.2)
+    rack (2.0.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0.beta1)
-      actionmailer (= 4.2.0.beta1)
-      actionpack (= 4.2.0.beta1)
-      actionview (= 4.2.0.beta1)
-      activejob (= 4.2.0.beta1)
-      activemodel (= 4.2.0.beta1)
-      activerecord (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+    rails (5.1.0)
+      actioncable (= 5.1.0)
+      actionmailer (= 5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta1)
-      sprockets-rails (~> 3.0.0.beta1)
-    rails-deprecated_sanitizer (1.0.2)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.2)
-      activesupport
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    railties (4.2.0.beta1)
-      actionpack (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+      railties (= 5.1.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    sprockets (2.12.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    temple (0.8.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 PLATFORMS
   ruby
@@ -136,7 +149,10 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   green_monkey!
   nokogiri
-  rails (= 4.2.0.beta1)
+  rails (= 5.1.0)
   rspec (>= 2.9.0)
   rspec-rails
   sqlite3
+BUNDLED WITH
+   1.14.6

data/{Gemfile.rails-4.1 → Gemfile.rails-4.2} RENAMED

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec
-gem "rails", "4.1.5"
+gem "rails", "4.2.8"

data/{Gemfile.rails-3.2 → Gemfile.rails-5} RENAMED

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec
-gem "rails", "3.2.19"
+gem "rails", "5.0.2"

data/{Gemfile.rails-3.0 → Gemfile.rails-5.1} RENAMED

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 gemspec
-gem "rails", "3.0.20"
+gem "rails", "5.1.0"

data/README.md CHANGED

@@ -2,7 +2,7 @@
 ## About
-This Gem allows you to make html-layout with microdata properties easier. It works with ruby 1.9+, rails 4, rails 3, haml 3.
+This Gem allows you to make html-layout with microdata properties easier. It works with ruby 2.2+, rails 4, rails 5, haml 5+.
 ![Green Monkey](http://upload.wikimedia.org/wikipedia/commons/thumb/b/b1/Bijilo-Portrait-of-a-Callithrix-Monkey.jpg/320px-Bijilo-Portrait-of-a-Callithrix-Monkey.jpg)

data/green_monkey.gemspec CHANGED

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name        = "green_monkey"
-  s.version     = '0.2.2'
+  s.version     = '0.3.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pavel Evstigneev"]
   s.email       = ["pavel.evst@gmail.com"]

data/lib/green_monkey/ext/action_view.rb CHANGED

@@ -1,24 +1,50 @@
 # Add support for "itemscope" html attributes
+#module GreenMonkeyActionViewExt
+#end
+# For rails < 5
 module ActionView::Helpers::TagHelper
   # Rails by default does not behave with itemscope as boolean attribute
   # and renders it as itemscope="true"
   # this changes make it render as itemscope="itemscope"
-  BOOLEAN_ATTRIBUTES.merge(['itemscope', :itemscope])
+  unless BOOLEAN_ATTRIBUTES.include?("itemscope")
+    BOOLEAN_ATTRIBUTES.merge(['itemscope', :itemscope])
+  end
-  private
+  if private_instance_methods.include?(:tag_options)
+    private
-  # this hack replaces itemscope="itemscope" => itemscope
-  # to make it follow standarts (http://www.w3.org/TR/microdata/#typed-items)
-  alias_method :tag_options_before_green_monkey, :tag_options
-  def tag_options(options, escape = true)
-    str = tag_options_before_green_monkey(options, escape)
+    # this hack replaces itemscope="itemscope" => itemscope
+    # to make it follow standarts (http://www.w3.org/TR/microdata/#typed-items)
+    alias_method :tag_options_before_green_monkey, :tag_options
+    def tag_options(options, escape = true)
+      str = tag_options_before_green_monkey(options, escape)
-    if options['itemscope'] || options[:itemscope]
-      str = (str + '').sub(/itemscope=('|")itemscope('|")/, 'itemscope').html_safe
+      if options['itemscope'] || options[:itemscope]
+        str = (str + '').sub(/itemscope=('|")itemscope('|")/, 'itemscope').html_safe
+      end
+      str
     end
+  end
+end
-    str
+# For rails 5+
+if defined?(ActionView::Helpers::TagHelper::TagBuilder)
+  class ActionView::Helpers::TagHelper::TagBuilder
+    # this hack replaces itemscope="itemscope" => itemscope
+    # to make it follow standarts (http://www.w3.org/TR/microdata/#typed-items)
+    alias_method :tag_options_before_green_monkey, :tag_options
+    def tag_options(options, escape = true)
+      str = tag_options_before_green_monkey(options, escape)
+      if options['itemscope'] || options[:itemscope]
+        str = (str + '').sub(/itemscope=('|")itemscope('|")/, 'itemscope').html_safe
+      end
+      str
+    end
   end
 end

data/lib/green_monkey/ext/haml.rb CHANGED

@@ -3,7 +3,7 @@ require "haml"
 # this hack looks at active-record object's :html_schema_type field and adds itemscope, itemid and itemtype to element
 # example:
 #
-# %article[post]
+# %article[post]
 # => <article class="post" itemscope itemtype="http://schema.org/BlogPosting" itemid="1">
 #
 # %section[Mida(:Blog)]
@@ -25,7 +25,11 @@ class Haml::Buffer
     options = {}
     ref.each do |obj|
       next if obj == "local-variable"
-      self.class.merge_attrs(options, process_object_ref(obj))
+      if self.class.respond_to?(:merge_attrs)
+        self.class.merge_attrs(options, process_object_ref(obj))
+      else
+        Haml::AttributeBuilder.merge_attributes!(options, process_object_ref(obj))
+      end
     end
     options
   end
@@ -49,7 +53,7 @@ class Haml::Buffer
       # my hack for microdata attributes
       if obj.respond_to?(:html_schema_type)
         options['itemscope'] = true
-        options['itemid'] = obj.id
+        options['itemid'] = obj.has_attribute?(:slug) ? obj.slug : obj.id
         if obj.html_schema_type.kind_of?(Mida::Vocabulary)
           options['itemtype'] = obj.html_schema_type.itemtype.source
@@ -63,4 +67,4 @@ class Haml::Buffer
     end
   end
-end
+end

data/lib/green_monkey/ext/view_helper.rb CHANGED

@@ -106,7 +106,11 @@ module GreenMonkey
         options.merge!(itemtype: object)
       end
-      tag_options(options)
+      if respond_to?(:tag_options) || private_methods.include?(:tag_options)
+        send(:tag_options, options)
+      else
+        tag_builder.tag_options(options)
+      end
     end
     def breadcrumb_link_to(title, path, options = {})

data/spec/action_view_spec.rb CHANGED

@@ -7,7 +7,7 @@ describe "ActionView hacks" do
   include TestInlineRenderer
   it "should works with stylesheet_link_tag" do
-    str = render_haml "= stylesheet_link_tag 'application'"
+    str = render_haml "= stylesheet_link_tag 'application', skip_pipeline: true"
     str.should =~ %r{link.+href="/stylesheets/application.css.*"}
   end
@@ -36,7 +36,7 @@ describe "ActionView hacks" do
     str = render_haml('= breadcrumb_link_to("Home", "/")').strip
     str.index('http://data-vocabulary.org/Breadcrumb').should_not == nil
     str.should == '<span itemscope itemtype="http://data-vocabulary.org/Breadcrumb">' +
-                    '<a href="/" itemprop="url"><span itemprop="title">Home</span></a>' +
+                    '<a itemprop="url" href="/"><span itemprop="title">Home</span></a>' +
                   '</span>'
   end
 end

data/spec/spec_helper.rb CHANGED

@@ -1,4 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+#ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 ENV['RAILS_ENV'] ||= 'development'
 require 'bundler/setup'
@@ -6,6 +6,7 @@ require 'bundler/setup'
 require 'rails/all'
 require 'rails/generators'
 require 'rails/generators/test_case'
+require 'haml'
 require "green_monkey"
@@ -18,6 +19,9 @@ module TestApp
   end
 end
+class ApplicationController < ActionController::Base
+end
 Rails.application = TestApp::Application
 module Rails
@@ -59,9 +63,13 @@ end
 module TestInlineRenderer
   def render_file(file, options = {})
-    ActionController::Base.new.render_to_string(file: file, locals: options, handlers: [:haml])
+    if ApplicationController.respond_to?(:render)
+      ApplicationController.render(file: file, locals: options)
+    else
+      ActionController::Base.new.render_to_string(file: file, locals: options, handlers: [:haml])
+    end
   end
   def render_haml(template, options = {})
     $t += 1
     file = File.expand_path(File.dirname(__FILE__) + "/../tmp/#{$t}.haml")

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green_monkey
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -134,12 +134,10 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.haml-edge
 - Gemfile.lock
-- Gemfile.rails-3.0
-- Gemfile.rails-3.1
-- Gemfile.rails-3.2
-- Gemfile.rails-4.1
+- Gemfile.rails-4.2
+- Gemfile.rails-5
+- Gemfile.rails-5.1
 - README.md
 - Rakefile
 - green_monkey.gemspec
@@ -186,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.2.0
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.1
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Rails and Haml microdata toolkit
 test_files: []
-has_rdoc:

data/Gemfile.haml-edge DELETED

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem "haml", git: "https://github.com/haml/haml.git"
-gem 'tzinfo'

data/Gemfile.rails-3.1 DELETED

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem "rails", "3.1.12"