jquery-modal-rails 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,33 @@
-source :gemcutter
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.8'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+
+  gem 'jquery-ui-rails'
+end
+
+gem 'jquery-rails'
 
 # Specify your gem's dependencies in jquery-modal-rails.gemspec
 gemspec
+
+# add rspec
+gem 'rspec'
+gem 'rspec-rails'
+gem 'shoulda', :require => false

data/demoapp/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.8'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/lib/jquery/modal/helpers/link_helpers.rb

@@ -9,25 +9,37 @@ module Jquery
     #   link_to(body, url, html_options = {})
     #   link_to(body, url)
     #
-    def link_to_modal(body, url, html_options = {})
-      # extend the html_options
-      html_options[:rel] = "modal:open"
-      if (html_options.has_key?(:remote))
-        if (html_options[:remote] == true)
-          html_options[:rel] = "modal:open:ajaxpost"
+    def link_to_modal(*args, &block)
+      if block_given?
+        options      = args.first || {}
+        html_options = args.second
+        block_result = yield(*args)
+        link_to_modal(block_result, options, html_options)
+      else
+        name         = args[0]
+        options      = args[1] || {}
+        html_options = args[2] || {}
+
+        # extend the html_options
+        html_options[:rel] = "modal:open"
+        if (html_options.has_key?(:remote))
+          if (html_options[:remote] == true)
+            html_options[:rel] = "modal:open:ajaxpost"
+          end
+
+          # remove the remote tag
+          html_options.delete(:remote)
         end
 
-        # remove the remote tag
-        html_options.delete(:remote)
-      end
-      # check if we have an id
-      html_options[:id] = UUIDTools::UUID.random_create().to_s unless html_options.has_key?(:id)
+        # check if we have an id
+        html_options[:id] = UUIDTools::UUID.random_create().to_s unless html_options.has_key?(:id)
 
-      # perform the normal link_to operation
-      html_link = link_to(body, url, html_options)
+        # perform the normal link_to operation
+        html_link = link_to(name, options, html_options)
 
-      # emit both
-      html_link.html_safe
+        # emit both
+        html_link.html_safe
+      end
     end
   end
 end

data/lib/jquery/modal/rails/engine.rb

@@ -2,6 +2,10 @@ module Jquery
   module Modal
     module Rails
       class Engine < ::Rails::Engine
+        config.generators do |g|
+          g.test_framework :rspec
+          g.integration_tool :rspec
+        end
       end
     end
   end

data/lib/jquery/modal/rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Modal
     module Rails
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
       JQUERY_MODAL_VERSION = "0.5"
     end
   end

data/spec/jquery/modal/link_helpers_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Jquery::Helpers do
+  include ActionView::Helpers, ::ERB::Util, ActionView::Context
+  include Jquery::Helpers
+
+
+  it "offers default link" do
+    link_to_modal("SimpleDialog", "http://www.google.de", :id => 1).should \
+      eq('<a href="http://www.google.de" id="1" rel="modal:open">SimpleDialog</a>')
+  end
+
+  it "offers AJAX link" do
+    link_to_modal("SimpleDialog", "http://www.google.de", :id => 1, :remote => true).should \
+      eq('<a href="http://www.google.de" id="1" rel="modal:open:ajaxpost">SimpleDialog</a>')
+  end
+
+  it "supports block for default link" do
+    link = link_to_modal("http://www.google.de", :id => 1) do
+      "SimpleDialog"
+    end
+
+    link.should eq('<a href="http://www.google.de" id="1" rel="modal:open">SimpleDialog</a>')
+  end
+
+  it "supports block for AJAX link" do
+    link = link_to_modal("http://www.google.de", :id => 1, :remote => true) do
+      "SimpleDialog"
+    end
+
+    link.should eq('<a href="http://www.google.de" id="1" rel="modal:open:ajaxpost">SimpleDialog</a>')
+  end
+
+  it "supports block for complex AJAX link" do
+    link = link_to_modal("http://www.google.de", :id => 1, :remote => true) do
+      content_tag(:div) do
+        content_tag(:p) do
+          "SimpleDialog"
+        end
+      end
+    end
+
+    link.should eq('<a href="http://www.google.de" id="1" rel="modal:open:ajaxpost"><div><p>SimpleDialog</p></div></a>')
+  end
+
+  it "does not crash with only two paraemters" do
+    link_to_modal('New User Modal', "http://google.de").should_not be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+ENV['RAILS_ENV'] = 'test'
+ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
+
+require File.expand_path("../../demoapp/config/environment", __FILE__)
+
+require 'bundler'
+Bundler.require(:default)
+
+require 'rspec/rails'
+require 'shoulda'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+
+#
+# General config for RSpec
+RSpec.configure do |config|
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-modal-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -135,6 +135,7 @@ files:
 - demoapp/db/migrate/20120621084323_create_users.rb
 - demoapp/db/schema.rb
 - demoapp/db/seeds.rb
+- demoapp/db/test.sqlite3
 - demoapp/doc/README_FOR_APP
 - demoapp/log/development.log
 - demoapp/public/404.html
@@ -158,6 +159,8 @@ files:
 - lib/jquery/modal/rails.rb
 - lib/jquery/modal/rails/engine.rb
 - lib/jquery/modal/rails/version.rb
+- spec/jquery/modal/link_helpers_spec.rb
+- spec/spec_helper.rb
 - vendor/assets/images/close.png
 - vendor/assets/images/spinner.gif
 - vendor/assets/javascripts/jquery.modal.js