mjs 0.0.6 → 0.1.1

data/Rakefile

@@ -8,8 +8,8 @@ GEM_NAME = "mjs"
 AUTHOR = "maiha"
 EMAIL = "maiha@wota.jp"
 HOMEPAGE = "http://github.com/maiha/mjs"
-SUMMARY = "A slice for the Merb framework that offers Ajax actions like RJS with jQuery"
-GEM_VERSION = "0.0.6"
+SUMMARY = "A ruby library that offers Ajax actions like RJS with jQuery"
+GEM_VERSION = "0.1.1"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'merb'
@@ -23,7 +23,8 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 1.0.7.1')
+#  s.add_dependency('merb-slices', '>= 1.0.7.1')
+   s.add_dependency('extlib', '>= 0.9.14')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
 end

data/lib/mjs.rb

@@ -1,86 +1,6 @@
-if defined?(Merb::Plugins)
-
-  $:.unshift File.dirname(__FILE__)
-
-  dependency 'merb-slices', :immediate => true
-  Merb::Plugins.add_rakefiles "mjs/merbtasks", "mjs/slicetasks", "mjs/spectasks"
-
-  # Register the Slice for the current host application
-  Merb::Slices::register(__FILE__)
-  
-  # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout, so you can swicht to 
-  # the main application layout or no layout at all if needed.
-  # 
-  # Configuration options:
-  # :layout - the layout to use; defaults to :mjs
-  # :mirror - which path component types to use on copy operations; defaults to all
-  Merb::Slices::config[:mjs][:layout] ||= :mjs
-  
-  # All Slice code is expected to be namespaced inside a module
-  module Mjs
-    
-    # Slice metadata
-    self.description = "A slice for the Merb framework that offers Ajax actions like RJS with jQuery"
-    self.version = "0.0.1"
-    self.author = "maiha"
-    
-    # Stub classes loaded hook - runs before LoadClasses BootLoader
-    # right after a slice's classes have been loaded internally.
-    def self.loaded
-      require 'mjs/helper'
-    end
-    
-    # Initialization hook - runs before AfterAppLoads BootLoader
-    def self.init
-      Merb::Controller.send(:include, ::Mjs::Helper)
-    end
-    
-    # Activation hook - runs after AfterAppLoads BootLoader
-    def self.activate
-    end
-    
-    # Deactivation hook - triggered by Merb::Slices.deactivate(Mjs)
-    def self.deactivate
-    end
-    
-    # Setup routes inside the host application
-    #
-    # @param scope<Merb::Router::Behaviour>
-    #  Routes will be added within this scope (namespace). In fact, any 
-    #  router behaviour is a valid namespace, so you can attach
-    #  routes at any level of your router setup.
-    #
-    # @note prefix your named routes with :mjs_
-    #   to avoid potential conflicts with global named routes.
-    def self.setup_router(scope)
-      # example of a named route
-      scope.match('/index(.:format)').to(:controller => 'main', :action => 'index').name(:index)
-      # the slice is mounted at /mjs - note that it comes before default_routes
-      scope.match('/').to(:controller => 'main', :action => 'index').name(:home)
-      # enable slice-level default routes by default
-      scope.default_routes
-    end
-    
-  end
-  
-  # Setup the slice layout for Mjs
-  #
-  # Use Mjs.push_path and Mjs.push_app_path
-  # to set paths to mjs-level and app-level paths. Example:
-  #
-  # Mjs.push_path(:application, Mjs.root)
-  # Mjs.push_app_path(:application, Merb.root / 'slices' / 'mjs')
-  # ...
-  #
-  # Any component path that hasn't been set will default to Mjs.root
-  #
-  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
-  Mjs.setup_default_structure!
-  
-  # Add dependencies for other Mjs classes below. Example:
-  # dependency "mjs/other"
-
-
-  
+module Mjs
 end
+
+require File.dirname(__FILE__) + '/mjs/helper'
+require File.dirname(__FILE__) + '/mjs/merb'
+require File.dirname(__FILE__) + '/mjs/sinatra'

data/lib/mjs/helper.rb

@@ -1,4 +1,5 @@
-require 'mjs/java_script_context'
+require 'extlib'
+require File.dirname(__FILE__) + '/java_script_context'
 
 module Mjs
   module Helper
@@ -10,7 +11,6 @@ module Mjs
       build_href(opts)
       unless opts[:submit]
         opts[:url] ||= opts[:href]
-        opts[:dataType] = "script"
       end
       function = "jQuery.ajax(%s);" % options_for_ajax(opts)
       confirm  = opts.delete(:confirm)
@@ -20,11 +20,10 @@ module Mjs
 
     # experimental: not tested yet
     def button_to(name, url='', opts={})
-      ajax = remote_function(opts)
       opts[:type] = 'button'
       opts[:value] = name
-      opts[:remote] ||= true if opts[:submit]
-      if opts.delete(:remote)
+
+      if opts.delete(:remote) || opts[:submit] || opts[:update]
         ajax = remote_function(opts)
         opts[:onclick] = "#{opts.delete(:onclick)}; #{ajax}; return false;"
       end
@@ -33,13 +32,16 @@ module Mjs
 
     # override! :link_to # for Ajax
     def link_to(name, url='', opts={})
-      opts[:href]   ||= url
-      opts[:remote] ||= true if opts[:submit]
-      return super unless opts.delete(:remote)
+      opts[:href] ||= url
+
+      if opts.delete(:remote) || opts[:submit] || opts[:update]
+        ajax = remote_function(opts)
+        opts[:onclick] = "#{opts.delete(:onclick)}; #{ajax}; return false;"
+        opts[:href] = '#'
+      else
+        opts[:href] ||= url
+      end
 
-      ajax = remote_function(opts)
-      opts[:onclick] = "#{opts.delete(:onclick)}; #{ajax}; return false;"
-      opts[:href] = '#'
       %{<a #{ opts.to_xml_attributes }>#{name}</a>}
     end
 
@@ -64,7 +66,7 @@ module Mjs
 
     private
       def build_href(opts)
-        if opts[:href].is_a?(DataMapper::Resource)
+        if defined?(DataMapper) and opts[:href].is_a?(DataMapper::Resource)
           record = opts[:href]
           if record.new_record?
             opts[:href] = resource(record.class.name.downcase.pluralize.intern, :new)
@@ -100,14 +102,20 @@ module Mjs
           else
             raise ArgumentError, "link_to :submit expects Symbol or String, but got #{submit.class.name}"
           end
+
         build_href(options)
 
         if target
           js_options[:type] = "'POST'"
           js_options[:data] = "#{target}.serialize()"
         end
+
+        if options[:type]
+          js_options[:type] = "'%s'" % options.delete(:type).to_s.upcase
+        end
+
         js_options[:url]  = "'#{options[:url] || options[:href]}'"
-        js_options[:dataType] = "'script'"
+        js_options[:dataType] ||= "'script'"
 
         if js_options[:url].blank?
           raise "Cannot build ajax options because url is blank. (#{options.inspect})"
@@ -136,8 +144,9 @@ module Mjs
       # this method affects "options"
       def build_callbacks!(options)
         callbacks = {}
+        events = [:before, :success, :complete]
 
-        [:before, :complete].each do |event|
+        events.each do |event|
           options[event] = Array(options[event])
         end
 
@@ -148,13 +157,21 @@ module Mjs
           options[:complete] << "#{target}.hide()"
         end
 
-        [:before, :complete].each do |event|
+        # dom updator
+        update = options.delete(:update)
+        if update
+          callbacks[:dataType] = "'html'"
+          callbacks[:type] ||= "'POST'"
+          options[:success] << "%s.html(request)" % jquery_selector(update)
+        end
+
+        events.each do |event|
           options[event] = options[event].compact * ';'
         end
 
         options.each do |callback, code|
           if (name = AJAX_FUNCTIONS[callback])
-            callbacks[name.to_s] = "function(request){#{code}}"
+            callbacks[name.to_s] = "function(request){#{code}}" unless code.to_s.empty?
             options.delete(callback)
           end
         end

data/lib/mjs/java_script_context.rb

@@ -42,7 +42,7 @@ module Mjs
               JavaScriptElementProxy.new(self, id)
             else
               raise NotImplementedError, "[MJS] RecordIdentifier.dom_id(id)"
-              JavaScriptElementProxy.new(self, ActionController::RecordIdentifier.dom_id(id))
+#              JavaScriptElementProxy.new(self, ActionController::RecordIdentifier.dom_id(id))
             end
           end
 

data/lib/mjs/merb.rb

@@ -0,0 +1,86 @@
+if defined?(Merb::Plugins)
+
+  $:.unshift File.dirname(__FILE__)
+
+  dependency 'merb-slices', :immediate => true
+  Merb::Plugins.add_rakefiles "mjs/merbtasks", "mjs/slicetasks", "mjs/spectasks"
+
+  # Register the Slice for the current host application
+  Merb::Slices::register(__FILE__)
+  
+  # Slice configuration - set this in a before_app_loads callback.
+  # By default a Slice uses its own layout, so you can swicht to 
+  # the main application layout or no layout at all if needed.
+  # 
+  # Configuration options:
+  # :layout - the layout to use; defaults to :mjs
+  # :mirror - which path component types to use on copy operations; defaults to all
+  Merb::Slices::config[:mjs][:layout] ||= :mjs
+  
+  # All Slice code is expected to be namespaced inside a module
+  module Mjs
+    
+    # Slice metadata
+    self.description = "A slice for the Merb framework that offers Ajax actions like RJS with jQuery"
+    self.version = "0.0.1"
+    self.author = "maiha"
+    
+    # Stub classes loaded hook - runs before LoadClasses BootLoader
+    # right after a slice's classes have been loaded internally.
+    def self.loaded
+      require 'mjs/helper'
+    end
+    
+    # Initialization hook - runs before AfterAppLoads BootLoader
+    def self.init
+      Merb::Controller.send(:include, ::Mjs::Helper)
+    end
+    
+    # Activation hook - runs after AfterAppLoads BootLoader
+    def self.activate
+    end
+    
+    # Deactivation hook - triggered by Merb::Slices.deactivate(Mjs)
+    def self.deactivate
+    end
+    
+    # Setup routes inside the host application
+    #
+    # @param scope<Merb::Router::Behaviour>
+    #  Routes will be added within this scope (namespace). In fact, any 
+    #  router behaviour is a valid namespace, so you can attach
+    #  routes at any level of your router setup.
+    #
+    # @note prefix your named routes with :mjs_
+    #   to avoid potential conflicts with global named routes.
+    def self.setup_router(scope)
+      # example of a named route
+      scope.match('/index(.:format)').to(:controller => 'main', :action => 'index').name(:index)
+      # the slice is mounted at /mjs - note that it comes before default_routes
+      scope.match('/').to(:controller => 'main', :action => 'index').name(:home)
+      # enable slice-level default routes by default
+      scope.default_routes
+    end
+    
+  end
+  
+  # Setup the slice layout for Mjs
+  #
+  # Use Mjs.push_path and Mjs.push_app_path
+  # to set paths to mjs-level and app-level paths. Example:
+  #
+  # Mjs.push_path(:application, Mjs.root)
+  # Mjs.push_app_path(:application, Merb.root / 'slices' / 'mjs')
+  # ...
+  #
+  # Any component path that hasn't been set will default to Mjs.root
+  #
+  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
+  Mjs.setup_default_structure!
+  
+  # Add dependencies for other Mjs classes below. Example:
+  # dependency "mjs/other"
+
+
+  
+end

data/lib/mjs/sinatra.rb

@@ -0,0 +1,11 @@
+if defined?(Sinatra)
+
+  module Mjs
+    module Helper
+      def self.registered(app)
+        app.helpers Mjs::Helper
+      end
+    end
+  end
+
+end

data/spec/helper_spec.rb

@@ -0,0 +1,127 @@
+require File.join(File.dirname(__FILE__), '/spec_helper')
+
+class HelperSandbox
+  include Mjs::Helper
+end
+
+module Spec::Example::Subject::ExampleGroupMethods
+  def remote_function(opts, expected = nil, &block)
+    it "remote_function(#{opts.inspect})" do
+      subject.remote_function(opts).should == (expected || block.call)
+    end
+  end
+end
+
+describe Mjs::Helper do
+  subject {HelperSandbox.new}
+
+  ######################################################################
+  ### link_to
+
+  provide :link_to
+
+  describe "#link_to" do
+    def call(opts = {})
+      subject.link_to("label", '/', opts)
+    end
+
+    it "should not call remote_function" do
+      mock(subject).remote_function.never
+      call
+    end
+
+    describe " should call remote_function" do
+      before do
+        mock(subject).remote_function.with_any_args
+      end
+
+      it "when :remote given" do
+        call :remote => true
+      end
+
+      it "when :submit given" do
+        call :submit=>:form
+      end
+
+      it "when :update given" do
+        call :remote=>:dst
+      end
+    end
+  end
+
+  ######################################################################
+  ### button_to
+
+  provide :button_to
+
+  describe "#button_to" do
+    def call(opts = {})
+      subject.button_to("label", '/', opts)
+    end
+
+    it "should not call remote_function" do
+      mock(subject).remote_function.never
+      call
+    end
+
+    describe " should call remote_function" do
+      before do
+        mock(subject).remote_function.with_any_args
+      end
+
+      it "when :remote given" do
+        call :remote => true
+      end
+
+      it "when :submit given" do
+        call :submit=>:form
+      end
+
+      it "when :update given" do
+        call :remote=>:dst
+      end
+    end
+  end
+
+  ######################################################################
+  ### remote_function
+
+  provide :remote_function
+
+  remote_function(:url=>'/') do
+    "jQuery.ajax({dataType:'script', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :remote=>true) do
+    "jQuery.ajax({dataType:'script', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :submit=>:form) do
+    "jQuery.ajax({data:jQuery('#form input, #form select, #form textarea').serialize(), dataType:'script', type:'POST', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :submit=>"form") do
+    "jQuery.ajax({data:jQuery('form').serialize(), dataType:'script', type:'POST', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :update=>:dst) do
+    "jQuery.ajax({dataType:'html', success:function(request){jQuery('#dst').html(request)}, type:'POST', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :update=>"dst") do
+    "jQuery.ajax({dataType:'html', success:function(request){jQuery('dst').html(request)}, type:'POST', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :update=>:dst, :type=>:get) do
+    "jQuery.ajax({dataType:'html', success:function(request){jQuery('#dst').html(request)}, type:'GET', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :update=>"dst", :type=>:get) do
+    "jQuery.ajax({dataType:'html', success:function(request){jQuery('dst').html(request)}, type:'GET', url:'/'});"
+  end
+
+  remote_function(:url=>'/', :submit=>"form", :update=>:dst) do
+    "jQuery.ajax({data:jQuery('form').serialize(), dataType:'html', success:function(request){jQuery('#dst').html(request)}, type:'POST', url:'/'});"
+  end
+
+end

data/spec/its_helper.rb

@@ -0,0 +1,15 @@
+module Spec
+  module Example
+    module Subject
+      module ExampleGroupMethods
+        def its(*args, &block)
+          describe(args.first) do
+            define_method(:subject) { super().send(*args) }
+            it(&block)
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/mjs_spec.rb

@@ -1,20 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.join(File.dirname(__FILE__), '/spec_helper')
 
-describe "Mjs (module)" do
-  
-  # Implement your Mjs specs here
-  
-  # To spec Mjs you need to hook it up to the router like this:
-  
-  # before :all do
-  #   Merb::Router.prepare { add_slice(:Mjs) } if standalone?
-  # end
-  # 
-  # after :all do
-  #   Merb::Router.reset! if standalone?
-  # end
-  #
-  #
-  # it "should have proper specs"
-  
-end
+describe "xxx" do
+end

data/spec/provide_helper.rb

@@ -0,0 +1,36 @@
+######################################################################
+### provide matcher
+Spec::Matchers.define :provide do |expected|
+  match do |obj|
+    (obj.public_methods + obj.protected_methods + obj.private_methods).include?(expected.to_s)
+  end
+end
+
+module Spec
+  module Example
+    module Subject
+      module ExampleGroupMethods
+        # == Examples
+        #
+        #   describe User do
+        #     subject { User.new }
+        #     provide :name
+        #
+        #       [intead of]
+        #
+        #     it "should provide #name" do
+        #       methods = subject.public_methods + subject.protected_methods + subject.private_methods
+        #       methods.should include("name")
+        #     end
+        #   end
+        #
+        def provide(name)
+          it "should provide ##{name}" do
+            subject.should provide(name)
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,58 +1,20 @@
-require 'rubygems'
-require 'merb-core'
-require 'merb-slices'
+
 require 'spec'
+require 'rr'
 
-# Add mjs.rb to the search path
-Merb::Plugins.config[:merb_slices][:auto_register] = true
-Merb::Plugins.config[:merb_slices][:search_path]   = File.join(File.dirname(__FILE__), '..', 'lib', 'mjs.rb')
+Spec::Runner.configure do |config|
+  config.mock_with RR::Adapters::Rspec
+end
 
-# Require mjs.rb explicitly so any dependencies are loaded
-require Merb::Plugins.config[:merb_slices][:search_path]
+Dir.glob(File.join(File.dirname(__FILE__), '/../lib/*.rb')).each{|lib| require lib}
+require File.join(File.dirname(__FILE__), '/its_helper')
+require File.join(File.dirname(__FILE__), '/provide_helper')
 
-# Using Merb.root below makes sure that the correct root is set for
-# - testing standalone, without being installed as a gem and no host application
-# - testing from within the host application; its root will be used
-Merb.start_environment(
-  :testing => true, 
-  :adapter => 'runner', 
-  :environment => ENV['MERB_ENV'] || 'test',
-  :session_store => 'memory'
-)
 
-module Merb
-  module Test
-    module SliceHelper
-      
-      # The absolute path to the current slice
-      def current_slice_root
-        @current_slice_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      end
-      
-      # Whether the specs are being run from a host application or standalone
-      def standalone?
-        Merb.root == ::Mjs.root
-      end
-      
-    end
-  end
+def path(key)
+  Pathname(File.join(File.dirname(__FILE__) + "/fixtures/#{key}"))
 end
 
-Spec::Runner.configure do |config|
-  config.include(Merb::Test::ViewHelper)
-  config.include(Merb::Test::RouteHelper)
-  config.include(Merb::Test::ControllerHelper)
-  config.include(Merb::Test::SliceHelper)
+def data(key)
+  (@__fixture_data_cache__ ||= {})[key] ||= path(key).read{}
 end
-
-# You can add your own helpers here
-#
-Merb::Test.add_helpers do
-  def mount_slice
-    Merb::Router.prepare { add_slice(:Mjs, "mjs") } if standalone?
-  end
-
-  def dismount_slice
-    Merb::Router.reset! if standalone?
-  end
-end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mjs
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - maiha
@@ -9,20 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +09:00
+date: 2010-03-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: merb-slices
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: extlib
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.7.1
-    version: 
-description: A slice for the Merb framework that offers Ajax actions like RJS with jQuery
+        segments: 
+        - 0
+        - 9
+        - 14
+        version: 0.9.14
+  type: :runtime
+  version_requirements: *id001
+description: A ruby library that offers Ajax actions like RJS with jQuery
 email: maiha@wota.jp
 executables: []
 
@@ -41,13 +50,17 @@ files:
 - lib/mjs/spectasks.rb
 - lib/mjs/helper.rb
 - lib/mjs/utils.rb
+- lib/mjs/sinatra.rb
+- lib/mjs/merb.rb
 - lib/mjs/page_object.rb
 - lib/mjs/slicetasks.rb
 - lib/mjs/merbtasks.rb
 - lib/mjs/java_script_context.rb
 - spec/mjs_spec.rb
+- spec/provide_helper.rb
+- spec/helper_spec.rb
+- spec/its_helper.rb
 - spec/spec_helper.rb
-- spec/requests/main_spec.rb
 - app/views/layout/mjs.html.erb
 - app/views/main/index.html.erb
 - app/controllers/main.rb
@@ -55,8 +68,6 @@ files:
 - app/helpers/application_helper.rb
 - public/stylesheets/master.css
 - public/javascripts/master.js
-- stubs/app/controllers/main.rb
-- stubs/app/controllers/application.rb
 has_rdoc: true
 homepage: http://github.com/maiha/mjs
 licenses: []
@@ -70,20 +81,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: A slice for the Merb framework that offers Ajax actions like RJS with jQuery
+summary: A ruby library that offers Ajax actions like RJS with jQuery
 test_files: []
 

data/spec/requests/main_spec.rb

@@ -1,30 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-
-describe  "/mjs/" do
-  
-  before(:all) do
-    mount_slice
-  end
-  
-  describe "GET /" do
-    
-    before(:each) do
-      @response = request("/mjs/")
-    end
-    
-    it "should be successful" do
-      @response.status.should be_successful
-    end
-    
-    # This is just an example of what you can do
-    # You can also use the other webrat methods to click links,
-    # fill up forms etc...
-    it "should render the default slice layout" do
-      @response.should have_tag(:h1, :content => "Mjs Slice")
-      @response.should have_selector("div#container div#main")
-      @response.should have_xpath("//div[@id='container']/div[@id='main']")
-    end
-    
-  end
-  
-end

data/stubs/app/controllers/application.rb

@@ -1,2 +0,0 @@
-class Mjs::Application < Merb::Controller
-end

data/stubs/app/controllers/main.rb

@@ -1,2 +0,0 @@
-class Mjs::Main < Mjs::Application
-end