wrap_it 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 995784a5858c83bfefb7ec041d0019e87535b279
-  data.tar.gz: 0e68c3329c7e692bbc685c09caf13981b7dcaa2a
+  metadata.gz: 1ebe2ad310631e9623416e7ab4cfbbfe46e8299f
+  data.tar.gz: d2609b1ad7a2f276e0d6f0d2753dac14ec0d8b48
 SHA512:
-  metadata.gz: 7fb4f2c24ce43bcdbb875dbc303aaa5562a0eb25d91aec437b6b30d254a1e2a3c6a9a22d8de9c00704048317b5aaf18ce19cfe00bb69765fd9735ddfb6801801
-  data.tar.gz: 0b026802d29c1c858e92d6de642b823a113b75fffef8a2c5420cd2b449137289c455d74eb87a7d2380ab86123dcf6a48ee7a16de6e9a6bbdd490638c55cd3f57
+  metadata.gz: e12f303b02f14177941305aee0b2e9102de737e1a2fd4b372a2481c9d7258ea5ef73f8f9dc618223b3a8c5f052bf4c7eb424a61ea9a83b120868475d2efb70de
+  data.tar.gz: a1b58c8121c98f0e39a6e645f2b2512210d90cced8e4c86ba11104012be533b2204b80381866aa2a6996991596b29eb5e70896296614f0296eb25001fe55e630

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 2.0.0-p353
+  - 2.1.0
+  - ruby-head
+env:
+  - FRAMEWORK=rails4 BUNDLE_GEMFILE=Gemfile.rails4
+  - FRAMEWORK=rails4 BUNDLE_GEMFILE=Gemfile.rails4
+  - FRAMEWORK=rails4 BUNDLE_GEMFILE=Gemfile.rails4
+gemfile:
+  - Gemfile.rails4
+  - Gemfile.rails4
+  - Gemfile.rails4

data/Gemfile.rails4

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4'
+gem 'rails', '~> 4.0'
+gem 'coveralls', require: false
+

data/Gemfile.sinatra

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sinatra'
+gem 'coveralls', require: false
+

data/README.md

@@ -1,5 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/wrap_it.png)](http://badge.fury.io/rb/wrap_it)
 [![Code Climate](https://codeclimate.com/github/cybernetlab/wrap_it.png)](https://codeclimate.com/github/cybernetlab/wrap_it)
+[![Build Status](https://travis-ci.org/cybernetlab/wrap_it.png?branch=master)](https://travis-ci.org/cybernetlab/wrap_it)
+[![Coverage Status](https://coveralls.io/repos/cybernetlab/wrap_it/badge.png?branch=master)](https://coveralls.io/r/cybernetlab/wrap_it?branch=master)
 
 # WrapIt
 
@@ -356,6 +358,12 @@ Look to [Reference documentation](http://rubydoc.info/github/cybernetlab/wrap_it
 
 # Changes
 
+`1.0.1`
+* refactor some code to remove complexity
+* code now tested with [travis](https://travis-ci.org/cybernetlab/wrap_it)
+* code now checked for test coverage by [coveralls](https://coveralls.io/r/cybernetlab/wrap_it)
+* code quality now checked by [codeclimate](https://codeclimate.com/github/cybernetlab/wrap_it)
+
 `1.0.0`
 * first release version
 * a lot of code refactored

data/Rakefile

@@ -24,4 +24,7 @@ require 'rspec/core/rake_task'
 # end
 
 #YARD::Rake::YardocTask.new
-RSpec::Core::RakeTask.new
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/wrap_it/base.rb

@@ -186,12 +186,11 @@ module WrapIt
       end
     end
 
-    def render_sections(*sections)
-      opts = sections.extract_options!
+    def render_sections(*sections, except: nil)
       sections.empty? && sections = self.class.sections
-      if opts.key?(:except)
-        opts[:except].is_a?(Array) || opts[:except] = [opts[:except]]
-        sections.reject! { |s| opts[:except].include?(s) }
+      unless except.nil?
+        except.is_a?(Array) || except = [except]
+        sections.reject! { |s| except.include?(s) }
       end
       # glew sections
       self.class.placement

data/lib/wrap_it/container.rb

@@ -76,7 +76,7 @@ module WrapIt
     #     {Sections} module for details.
     #
     # @return [String]
-    def self.child(name, *args, &block)
+    def self.child(name, *args, option: nil, **opts, &block)
       name.is_a?(String) && name.to_sym
       name.is_a?(Symbol) || fail(ArgumentError, 'Wrong child name')
       child_class =
@@ -87,35 +87,15 @@ module WrapIt
         end
       child_class = child_class.name if child_class.is_a?(Class)
 
-      opts = args.extract_options!
-      extract = opts.delete(:option)
-      args << opts
-
-      define_method name do |*helper_args, &helper_block|
-        # We should clone arguments becouse if we have loop in template,
-        # `extract_options!` below works only for first iterration
-        default_args = args.clone
-        options = helper_args.extract_options!
-        options[:helper_name] = name
-        options.merge!(default_args.extract_options!)
-        helper_args += default_args + [options]
-        add_children(name, child_class, block, *helper_args, &helper_block)
+      define_method name do |*hargs, extracted: false, **hopts, &hblock|
+        hargs += args
+        hopts.merge!(opts)
+        hopts[:helper_name] = name
+        child = prepare_child(child_class, block, *hargs, **hopts, &hblock)
+        add_children(name, child, extracted: extracted)
       end
 
-      unless extract.nil?
-        extract.is_a?(Array) || extract = [extract]
-        extract.each do |opt_name|
-          opt_name = name if opt_name == true
-          option(opt_name) do |_, arguments|
-            self.deffered_render = true
-            arguments.is_a?(Array) || arguments = [arguments]
-            o = arguments.extract_options!
-            o.merge!(extracted: true)
-            arguments << o
-            send name, *arguments
-          end
-        end
-      end
+      add_child_option(name, option)
     end
 
     after_capture do
@@ -145,14 +125,30 @@ module WrapIt
     CONTENT_SPLIT_REGEXP = /(<!-- WrapIt::Container\(\h+\) -->)/
     CONTENT_REPLACE_REGEXP = /\A<!-- WrapIt::Container\((?<obj_id>\h+)\) -->\z/
 
-    def add_children(name, helper_class, class_block, *args, &helper_block)
-      options = args.extract_options!
-      section = options.delete(:section) || :children
-      extracted = options.delete(:extracted) == true
-      args << options
+    def add_children(name, item, extracted: false)
+      deffered_render? && @children << item
+      return if extracted == true
+      if !deffered_render? && (omit_content? || extract_children?)
+        self[item.render_to] << capture { item.render }
+      end
+      if omit_content? || extract_children?
+        empty_html
+      else
+        if deffered_render?
+          html_safe("<!-- WrapIt::Container(#{item.object_id.to_s(16)}) -->")
+        else
+          item.render
+        end
+      end
+    end
+
+    def prepare_child(helper_class, class_block, *args,
+                      section: nil, **opts,
+                      &helper_block)
+      section ||= :children
       item = Object
         .const_get(helper_class)
-        .new(@template, *args, &helper_block)
+        .new(@template, *args, **opts, &helper_block)
       item.instance_variable_set(:@render_to, section)
       item.instance_variable_set(:@parent, self)
       item.define_singleton_method(:render_to) { @render_to }
@@ -161,19 +157,19 @@ module WrapIt
       end
       item.define_singleton_method(:parent) { @parent }
       class_block.nil? || instance_exec(item, &class_block)
+      item
+    end
 
-      deffered_render? && @children << item
-      return if extracted
-      if !deffered_render? && (omit_content? || extract_children?)
-        self[section] << capture { item.render }
-      end
-      if omit_content? || extract_children?
-        empty_html
-      else
-        if deffered_render?
-          html_safe("<!-- WrapIt::Container(#{item.object_id.to_s(16)}) -->")
-        else
-          item.render
+    def self.add_child_option(name, option)
+      return if option.nil?
+      option.is_a?(Array) || option = [option]
+      option.each do |opt_name|
+        opt_name = name if opt_name == true
+        option(opt_name) do |_, args|
+          self.deffered_render = true
+          args.is_a?(Array) || args = [args]
+          opts = args.extract_options!
+          send(name, *args, extracted: true, **opts)
         end
       end
     end

data/lib/wrap_it/version.rb

@@ -1,5 +1,5 @@
 #
 module WrapIt
   # Current gem version
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/frameworks/log/development.log

@@ -3739,3 +3739,107 @@
   Rendered inline template (2.8ms)
   Rendered inline template (1.7ms)
   Rendered inline template (1.7ms)
+  Rendered inline template (16.8ms)
+  Rendered inline template (1.8ms)
+  Rendered inline template (1.8ms)
+  Rendered inline template (2.4ms)
+  Rendered inline template (2.5ms)
+  Rendered inline template (3.2ms)
+  Rendered inline template (2.5ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (5.0ms)
+  Rendered inline template (9.3ms)
+  Rendered inline template (7.1ms)
+  Rendered inline template (6.7ms)
+  Rendered inline template (5.8ms)
+  Rendered inline template (1.8ms)
+  Rendered inline template (4.9ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (2.2ms)
+  Rendered inline template (2.4ms)
+  Rendered inline template (2.5ms)
+  Rendered inline template (3.3ms)
+  Rendered inline template (2.6ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (9.0ms)
+  Rendered inline template (6.3ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (6.6ms)
+  Rendered inline template (8.8ms)
+  Rendered inline template (5.8ms)
+  Rendered inline template (2.1ms)
+  Rendered inline template (2.6ms)
+  Rendered inline template (2.5ms)
+  Rendered inline template (2.9ms)
+  Rendered inline template (3.1ms)
+  Rendered inline template (3.8ms)
+  Rendered inline template (3.3ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (6.0ms)
+  Rendered inline template (1.7ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (1.8ms)
+  Rendered inline template (2.6ms)
+  Rendered inline template (2.7ms)
+  Rendered inline template (2.6ms)
+  Rendered inline template (3.4ms)
+  Rendered inline template (2.1ms)
+  Rendered inline template (2.1ms)
+  Rendered inline template (6.1ms)
+  Rendered inline template (6.4ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (2.9ms)
+  Rendered inline template (6.1ms)
+  Rendered inline template (6.3ms)
+  Rendered inline template (6.9ms)
+  Rendered inline template (2.3ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (6.6ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (22.0ms)
+  Rendered inline template (3.0ms)
+  Rendered inline template (6.8ms)
+  Rendered inline template (6.3ms)
+  Rendered inline template (1.6ms)
+  Rendered inline template (1.7ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (3.0ms)
+  Rendered inline template (2.5ms)
+  Rendered inline template (2.4ms)
+  Rendered inline template (2.3ms)
+  Rendered inline template (3.3ms)
+  Rendered inline template (2.2ms)
+  Rendered inline template (2.4ms)
+  Rendered inline template (2.7ms)
+  Rendered inline template (2.4ms)
+  Rendered inline template (3.1ms)
+  Rendered inline template (2.7ms)
+  Rendered inline template (5.0ms)
+  Rendered inline template (2.9ms)
+  Rendered inline template (6.7ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (6.9ms)
+  Rendered inline template (6.2ms)
+  Rendered inline template (6.7ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (2.0ms)
+  Rendered inline template (4.0ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (4.9ms)
+  Rendered inline template (6.3ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (6.4ms)
+  Rendered inline template (7.1ms)
+  Rendered inline template (6.8ms)
+  Rendered inline template (3.1ms)
+  Rendered inline template (1.7ms)
+  Rendered inline template (1.9ms)
+  Rendered inline template (1.7ms)
+  Rendered inline template (2.5ms)
+  Rendered inline template (2.4ms)
+  Rendered inline template (3.0ms)
+  Rendered inline template (2.5ms)

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'bundler'
+require 'coveralls'
+
+Coveralls.wear!
 
 Bundler.require :default, :development
 

data/wrap_it.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.1'
-  spec.add_development_dependency 'redcarpet', '~> 1.17'
+  spec.add_development_dependency 'redcarpet', '~> 3.0'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'rspec-html-matchers', '~> 0.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap_it
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alexey Ovchinnikov
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - .rspec
 - .rubocop.yml
 - .ruby-version
+- .travis.yml
 - .yardopts
 - Gemfile
 - Gemfile.rails4