dekiru 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c9a7e0ad3602d3e665926f79352c5c71d729c9
-  data.tar.gz: 844fbd4a34bd108f62eda72e28b0f72f70db8273
+  metadata.gz: cd5a7fc14faa2c42c45038e12d68c4788ceba430
+  data.tar.gz: c2102fa4f4ba153dec9bd3a668bdf80ce1e45f7c
 SHA512:
-  metadata.gz: b180e6b46f8564a097840027a9bae749c47dcad659ede9cb548c9009d451e6eeb5c5cfbb9e700f1cb572635b12f913511fbcb84f8de6ee0e1c8c6d968a75324b
-  data.tar.gz: 7635486c4d811bab103688851aef450cd36a01f08a076c7cea74a8d6db99b45f628234f6b89204f711dcaec3b07aab9a7e2f0cb7f70c138c4828a38da17d5020
+  metadata.gz: f8c7da994f0703d883a79f0c57886ea9aae63e856211b21af7697c44a505ffd35a20151b0378d3b36a42d7415b08c5b08bbfb92ed4fccb9b9e3a6afab97c782d
+  data.tar.gz: 5364ca6d5908249904699c8d67f3efeb8231eb46162c9a71d6a17963815a293e69e664737eb6b63bf2b9fbaf4976a58e5eea39d13cc3820c34894c76caf3d5fd

data/Rakefile

@@ -1,2 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+task :default => :spec
+
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ['--color', "--format progress"]
+  t.pattern = 'spec/dekiru/**/*_spec.rb'
+end

data/dekiru.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Dekiru::VERSION
 
   gem.add_dependency 'http_accept_language', [">= 2.0.0"]
+  gem.add_dependency 'rails'
   gem.add_development_dependency 'rake', [">= 0"]
+  gem.add_development_dependency 'rspec'
 end

data/lib/dekiru.rb

@@ -1,5 +1,5 @@
 require "dekiru/version"
-require "dekiru/railtie"
+require "dekiru/railtie" if defined?(::Rails)
 require "dekiru/helper"
 require "dekiru/controller_additions"
 

data/lib/dekiru/helper.rb

@@ -1,15 +1,16 @@
 module Dekiru
   module Helper
-    def menu_link_to(*args, &block)
-      url_obj = block_given? ? args[0] : args[1]
+    def menu_link_to(name = nil, options = nil, html_options = nil, &block)
+      args = [name, options, html_options]
+      html_options, options, name = options, name, block if block_given?
 
-      classes = []
-      classes << "active" if current_page?(url_obj)
+      classes = html_options.try(:delete, :li_class).try(:split, ' ') || []
+      classes << "active" if current_page?(options)
 
-      obj = [url_obj].flatten.last
+      obj = [options].flatten.last
       if obj.is_a?(ActiveRecord::Base)
         content_tag_for(:li, obj, :class => classes.join(' ')) do
-          link_to *args, &block
+          link_to name, options, html_options, &block
         end
       else
         content_tag(:li, :class => classes.join(' ')) do

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/dekiru/helper_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Dekiru::Helper do
+  let(:helper) do
+    class AClass
+      include Dekiru::Helper
+      include ActionView::Helpers::TagHelper
+      include ActionView::Context
+      include ActionView::Helpers::UrlHelper
+    end
+    a = AClass.new
+  end
+  describe "#menu_link_to" do
+    before do
+      helper.stub(:current_page?).and_return(true)
+    end
+    context "一番シンプルな呼び出し" do
+      it "動くこと" do
+        expect(helper.menu_link_to("テキスト", "/some_path")).to eq("<li class=\"active\"><a href=\"/some_path\">テキスト</a></li>")
+      end
+    end
+    context "blockなし" do
+      it "動くこと" do
+        expect(helper.menu_link_to("テキスト", "/some_path", class: "some_class")).to eq("<li class=\"active\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
+      end
+    end
+    context "blockあり" do
+      it "動くこと" do
+        html = helper.menu_link_to("/some_path", class: "some_class") do
+          "テキスト"
+        end
+        expect(html).to eq("<li class=\"active\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
+      end
+    end
+    context "今のページじゃない" do
+      before do
+        helper.stub(:current_page?).and_return(false)
+      end
+      it "動くこと" do
+        expect(helper.menu_link_to("テキスト", "/some_path", class: "some_class")).to eq("<li class=\"\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
+      end
+    end
+    context "li_class指定あり" do
+      it "動くこと" do
+        expect(helper.menu_link_to("テキスト", "/some_path", class: "some_class", li_class: "li_class")).to eq("<li class=\"li_class active\"><a class=\"some_class\" href=\"/some_path\">テキスト</a></li>")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'rspec'
+
+# For rails app
+require "active_support"
+require 'active_support/core_ext/object'
+require "active_record"
+require "action_view"
+require "action_view/helpers"
+
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+$LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
+
+require 'dekiru'
+
+Dir.glob(File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')).each do |file|
+  require(file)
+end
+
+RSpec.configure do |config|
+end

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
 description: Usefull helper methods for Ruby on Rails
@@ -45,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -56,6 +84,8 @@ files:
 - lib/dekiru/helper.rb
 - lib/dekiru/railtie.rb
 - lib/dekiru/version.rb
+- spec/dekiru/helper_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -65,12 +95,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: []
@@ -79,4 +109,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Usefull helper methods for Ruby on Rails
-test_files: []
+test_files:
+- spec/dekiru/helper_spec.rb
+- spec/spec_helper.rb