styx 0.0.4 → 0.1.0

data/.gitignore

@@ -0,0 +1,2 @@
+.idea/
+.rspec

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,131 @@
+PATH
+  remote: .
+  specs:
+    styx (0.0.4)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.2.3)
+      ffi (~> 1.0.6)
+    combustion (0.3.1)
+      rails (>= 3.1.0)
+      thor (>= 0.14.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.0.11)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.5)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    nokogiri (1.5.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.15.0)
+      childprocess (>= 0.2.1)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara (~> 1.1.2)
+  combustion (~> 0.3.1)
+  rspec-rails (~> 2.8.1)
+  styx!

data/README.md

@@ -167,6 +167,7 @@ License
 -------
 
     Copyright (C) 2011 by Boris Staal <boris@roundlake.ru>
+                          Alexander Pavlenko <a.pavlenko@roundlake.ru>
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require :development
+require 'rake'
+require 'rspec/core/rake_task'
+
+task RSpec::Core::RakeTask.new(:spec)

data/lib/styx/forms.rb

@@ -1,33 +1,27 @@
 module Styx
-  module Forms
-    def self.included base
-      base.send(:include, InstanceMethods)
-    end
-
-    module InstanceMethods
-      def styx_form_store_and_respond(entity, data=nil, &block)
-        response.content_type = Mime::TEXT
+  module Forms    
+    def styx_form_store_and_respond(entity, data=nil, &block)
+      response.content_type = Mime::TEXT
 
-        if entity.save
-          styx_form_respond_success(data, entity, &block)
-        else
-          styx_form_respond_failure(entity.class.name, entity.errors.messages)
-        end
+      if entity.save
+        styx_form_respond_success(data, entity, &block)
+      else
+        styx_form_respond_failure(entity.class.name, entity.errors.messages)
       end
+    end
 
-      def styx_form_respond_failure(entity, errors)
-        response.content_type = Mime::TEXT
+    def styx_form_respond_failure(entity, errors)
+      response.content_type = Mime::TEXT
 
-        errors = Hash[*errors.map {|x| [x, nil]}.flatten] if errors.is_a?(Array)
-        render :text => {:entity => entity.to_s.underscore.gsub('/', '_'), :messages => errors}.to_json, :status => :unprocessable_entity
-      end
+      errors = Hash[*errors.map {|x| [x, nil]}.flatten] if errors.is_a?(Array)
+      render :text => {:entity => entity.to_s.underscore.gsub('/', '_'), :messages => errors}.to_json, :status => :unprocessable_entity
+    end
 
-      def styx_form_respond_success(data, entity=nil, &block)
-        response.content_type = Mime::TEXT
+    def styx_form_respond_success(data, entity=nil, &block)
+      response.content_type = Mime::TEXT
 
-        block.call(entity) if block_given?
-        render :text => (data.is_a?(Proc) ? data.call(entity) : data)
-      end
+      block.call(entity) if block_given?
+      render :text => (data.is_a?(Proc) ? data.call(entity) : data)
     end
   end
 end

data/lib/styx/helpers.rb

@@ -1,40 +1,21 @@
 module Styx
   module Helpers
-    def self.included base
-      base.send(:include, InstanceMethods)
-      base.class_eval do
-        helper_method :this_page?, :this_namespace?
-      end
+    extend ActiveSupport::Concern
+    
+    included do
+      helper_method :this_page?, :this_namespace?
     end
 
-    module InstanceMethods
-      def this_page?(mask)
-        mask = [mask] unless mask.is_a?(Array)
-
-        flag = false
-
-        mask.each do |m|
-          m = m.to_s.split('#')
-
-          c = m[0]
-          a = m[1]
-
-          f = true
-
-          f = false if !c.blank? && c != controller_name
-          f = false if !a.blank? && a != action_name
-
-          flag ||= f
-        end
-
-        flag
+    def this_page?(mask)
+      [*mask].any? do |m|
+        c, a = m.to_s.split('#')
+        !(c.present? && c != controller_name || a.present? && a != action_name)
       end
+    end
 
-      def this_namespace?(namespace)
-        current = controller_path.split('/').first
-
-        return namespace == current
-      end
+    def this_namespace?(namespace)
+      # TODO: support nested namespaces?
+      namespace == controller_path.split('/').first
     end
   end
 end

data/lib/styx/initializer.rb

@@ -1,27 +1,24 @@
 module Styx
   module Initializer
-    def self.included base
-      base.send(:include, InstanceMethods)
-      base.class_eval do
-        helper_method :styx_initialize, :styx_initialize_with
-        before_filter { @styx_initialize_with = {} }
-      end
+    extend ActiveSupport::Concern
+    
+    included do
+      helper_method :styx_initialize, :styx_initialize_with
+      before_filter { @styx_initialize_with = {} }
+    end
+    
+    def styx_initialize_with(data)
+      @styx_initialize_with.merge! data
     end
 
-    module InstanceMethods
-      def styx_initialize_with(data)
-        @styx_initialize_with.merge! data
-      end
-
-      def styx_initialize()
-        result = render_to_string :partial => 'styx/initializer', :locals => {
-          :klass  => controller_path.gsub('/', '_').camelize,
-          :method => action_name, 
-          :data   => @styx_initialize_with
-        }
-        
-        result.html_safe
-      end
+    def styx_initialize()
+      result = render_to_string :partial => 'styx/initializer', :locals => {
+        :klass  => controller_path.gsub('/', '_').camelize,
+        :method => action_name, 
+        :data   => @styx_initialize_with
+      }
+      
+      result.html_safe
     end
   end
 end

data/spec/controllers/tests_controller_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe TestsController do
+  render_views
+
+  it 'index' do
+    get :index
+    response.body.should have_content('Styx.Initializers.Tests.initialize({"data":"test"})')
+    response.body.should have_content('Styx.Initializers.Tests.index({"data":"test"})')
+  end
+end

data/spec/internal/app/controllers/tests_controller.rb

@@ -0,0 +1,13 @@
+require 'styx'
+
+class TestsController < ActionController::Base
+
+  append_view_path Styx::Engine.paths['app/views']
+
+  include Styx::Initializer
+  include Styx::Forms
+
+  def index
+    styx_initialize_with :data => 'test'
+  end
+end

data/spec/internal/app/views/tests/index.html.erb

@@ -0,0 +1 @@
+<%= styx_initialize %>

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  resources :tests
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/lib/styx_forms_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Styx::Forms do
+
+  let :controller do
+    controller = double('controller')
+    controller.class_eval do
+      include Styx::Forms
+    end
+    controller.stub(:response => double('response'))
+    controller.response.should_receive(:content_type=).with(Mime::TEXT).at_least(:once)
+
+    controller
+  end
+
+  context '#styx_form_store_and_respond' do
+
+    it 'respond success' do
+      entity = double('model')
+      entity.stub(:save => true)
+      controller.should_receive(:styx_form_respond_success).with(data = Object.new, entity)
+      controller.styx_form_store_and_respond(entity, data) do |e|
+        e.should === entity
+        # whatever
+      end
+    end
+
+    it 'respond failure' do
+      entity = double('model')
+      entity.stub(:save => false)
+      entity.stub(:errors => double('errors'))
+      entity.errors.stub(:messages => {:field => ["can't this'", "can't that'"]})
+      controller.should_receive(:styx_form_respond_failure).with(entity.class.name, entity.errors.messages)
+      controller.styx_form_store_and_respond(entity)
+    end
+  end
+
+  it 'respond success' do
+    entity = Object.new
+    [
+      'data',
+      lambda {|e| e.should === entity; 'data' }
+    ].each do |data|
+      controller.should_receive(:render).with(:text => 'data')
+      controller.styx_form_respond_success(data, entity) do |e|
+        e.should === entity
+        # whatever
+      end
+    end
+  end
+
+  it 'respond failure' do
+
+    errors_cases = [
+      {:field => ["can't this'", "can't that'"]},
+      ['field1', 'field2']
+    ]
+
+    def normalize(errors)
+      errors.is_a?(Array) && Hash[*errors.map {|x| [x, nil]}.flatten] || errors
+    end
+
+    errors_cases.each do |errors|
+      json = {:entity => 'm_cl_name', :messages => normalize(errors)}.to_json
+      controller.should_receive(:render).with(:text => json, :status => :unprocessable_entity)
+      controller.styx_form_respond_failure('M::ClName', errors)
+    end
+  end
+end

data/spec/lib/styx_helpers_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Styx::Helpers do
+
+  let :controller do
+    controller = double('controller')
+    controller.class.should_receive(:helper_method).with(:this_page?, :this_namespace?)
+    controller.class_eval do
+      include Styx::Helpers
+    end
+
+    controller
+  end
+
+  it '#this_page?' do
+    controller.stub(:controller_name => 'tests')
+    controller.stub(:action_name => 'index')
+
+    cases = [
+      [
+        be_true, [
+          'tests#index',
+          '#index'
+        ]
+      ], [
+        be_false, [
+          'fails#index',
+          'tests#show',
+          '#show'
+        ]
+      ]
+    ]
+
+    cases.each do |group|
+      be_ok, examples = group
+      examples.each do |example|
+        controller.this_page?(example).should be_ok
+      end
+    end
+  end
+
+  it '#this_namespace?' do
+    controller.stub(:controller_path => 'module/tests')
+
+    cases = [
+      [
+        be_true, [
+          'module'
+        ]
+      ], [
+        be_false, [
+          'whatever'
+        ]
+      ]
+    ]
+
+    cases.each do |group|
+      be_ok, examples = group
+      examples.each do |example|
+        controller.this_namespace?(example).should be_ok
+      end
+    end
+  end
+end

data/spec/lib/styx_initializer_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Styx::Initializer do
+
+  let :controller do
+    controller = double('controller')
+    controller.class.should_receive(:helper_method).with(:styx_initialize, :styx_initialize_with)
+    controller.class.stub(:before_filter) do |block|
+      controller.instance_eval(&block)
+    end
+    controller.class_eval do
+      include Styx::Initializer
+    end
+    controller.instance_variable_get('@styx_initialize_with').should == {}
+
+    controller
+  end
+
+  it '#styx_initialize_with' do
+    controller.styx_initialize_with(:test => 'data')
+    controller.instance_variable_get('@styx_initialize_with').should == {:test => 'data'}
+  end
+
+  it '#styx_initialize' do
+    controller.stub(:controller_path => 'module/tests')
+    controller.stub(:action_name => 'index')
+    controller.should_receive(:render_to_string).and_return('rendered template')
+    result = controller.styx_initialize
+    result.should == 'rendered template'
+    result.html_safe?.should be_true
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'bundler'
+Bundler.require :development
+require 'capybara/rspec'
+Combustion.initialize! :action_controller, :action_view, :sprockets
+Bundler.require :default
+require 'rspec/rails'
+require 'capybara/rails'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

data/styx.gemspec

@@ -1,14 +1,18 @@
-SPEC = Gem::Specification.new do |s|
+Gem::Specification.new do |s|
   s.name        = "styx"
-  s.version     = "0.0.4"
+  s.version     = "0.1.0"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Set of helpers to maintain bridge between Server (Rails) side and Client (JS) side"
   s.email       = "boris@roundlake.ru"
   s.homepage    = "http://github.com/roundlake/styx"
   s.description = s.summary
-  s.authors     = ['Boris Staal']
+  s.authors     = ['Boris Staal', 'Alexander Pavlenko']
 
   s.has_rdoc = false # disable rdoc generation until we've got more
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
+
+  s.add_development_dependency 'combustion', '~> 0.3.1'
+  s.add_development_dependency 'rspec-rails', '~> 2.8.1'
+  s.add_development_dependency 'capybara', '~> 1.1.2'
 end

metadata

@@ -1,16 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: styx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
 - Boris Staal
+- Alexander Pavlenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
-dependencies: []
+date: 2012-01-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: &70186037571000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *70186037571000
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70186037570300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :development
+  prerelease: false
+  version_requirements: *70186037570300
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70186037569600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: *70186037569600
 description: Set of helpers to maintain bridge between Server (Rails) side and Client
   (JS) side
 email: boris@roundlake.ru
@@ -18,7 +52,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - README.md
+- Rakefile
 - app/assets/javascripts/styx.forms.js.coffee
 - app/assets/javascripts/styx.js.coffee
 - app/views/styx/_initializer.html.erb
@@ -28,6 +66,16 @@ files:
 - lib/styx/forms.rb
 - lib/styx/helpers.rb
 - lib/styx/initializer.rb
+- spec/controllers/tests_controller_spec.rb
+- spec/internal/app/controllers/tests_controller.rb
+- spec/internal/app/views/tests/index.html.erb
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/lib/styx_forms_spec.rb
+- spec/lib/styx_helpers_spec.rb
+- spec/lib/styx_initializer_spec.rb
+- spec/spec_helper.rb
 - styx.gemspec
 homepage: http://github.com/roundlake/styx
 licenses: []