widgets 0.1.3 → 0.2.0

data/app/helpers/application_helper.rb

@@ -7,12 +7,19 @@ module ApplicationHelper
     attributes = {:id => id, :'data-widget' => name, :style => options.delete(:style), :class => options.delete(:effects)}
     options[:widget_id] = id unless options.include? :widget_id
 
-    contents = if block_given?
-                 render :layout => partial, :inline => capture(&block), :locals => options, :formats => [:html]
-               else
-                 render :template => partial, :locals => options
-               end
+    html = if block_given?
+             render :layout => partial, :inline => capture(&block), :locals => options, :formats => [:html]
+           else
+             render :template => partial, :locals => options, :formats => [:html]
+           end
 
-    content_tag :div, contents, attributes
+    javascript = render :template => partial, :locals => options, :formats => [:js] rescue ActionView::MissingTemplate
+
+    content = content_tag :div, html, attributes
+    if javascript
+      content += content_tag :script, javascript, :type => 'text/javascript'
+    end
+
+    content
   end
 end

data/lib/widgets/version.rb

@@ -1,3 +1,3 @@
 module Widgets
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/lib/widgets/version.rb~

@@ -1,3 +1,3 @@
 module Widgets
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widgets
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guid
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -43,22 +59,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: specstar-support-random
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +147,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/helpers/application_helper.rb
-- app/helpers/application_helper.rb~
 - lib/tasks/widgets_tasks.rake
 - lib/widgets/version.rb
 - lib/widgets/version.rb~

data/app/helpers/application_helper.rb~

@@ -1,16 +0,0 @@
-module ApplicationHelper
-  def widget(name, options={}, &block)
-    id = Guid.new.to_s
-    partial = File.join 'widgets', name.to_s
-    attributes = {:id => id, :'data-widget' => name, :style => options.delete(:style), :class => options.delete(:effects)}
-    options[:widget_id] = id unless options.include? :widget_id
-
-    contents = if block_given?
-                 render :layout => partial, :inline => capture(&block), :locals => options, :formats => [:html]
-               else
-                 render :template => partial, :locals => options
-               end
-
-    content_tag :div, contents, attributes
-  end
-end