lolita 3.1.6 → 3.1.7

data/public/javascripts/lolita/application.js

@@ -0,0 +1 @@
+/* Use this file for you application specific javascript */

data/public/javascripts/lolita/main.js

@@ -12,11 +12,16 @@ $(function(){
   $("#flash").ajaxComplete(function(e,request){
     var notice=request.getResponseHeader("Lolita-Notice");
     var error=request.getResponseHeader("Lolita-Error");
+    var alert_msg=request.getResponseHeader("Lolita-Alert");
     if(notice){
       show_flash("<span style='color:green'>"+notice+"</span>");
     }else{
       if(error){
         show_flash("<span style='color:red'>"+error+"</span>");
+      }else{
+        if(alert_msg){
+          show_flash("<span style='color:yellow'>"+alert_msg+"</span>");
+        }
       }
     }
   })

data/spec/builder_spec.rb

@@ -4,38 +4,117 @@ class SimpleObject
   include Lolita::Builder
 end
 
+describe Lolita::Builder::Custom do
+  let(:object){SimpleObject.new}
+  let(:builder){Lolita::Builder::Custom.new(object,{})}
+  let(:klass){Lolita::Builder::Custom}
+
+  it "should create new Custom builder" do
+    builder = Lolita::Builder::Custom.new(object,{})
+  end
+
+  it "should set name and state" do
+    builder = Lolita::Builder::Custom.new(object,{:name => "name", :state=>"state"})
+    builder.instance_variable_get(:"@name").should == "name"
+    builder.instance_variable_get(:"@state").should == "state"
+  end
+
+  it "should set default attributes" do
+    builder = Lolita::Builder::Custom.new(object,{:name => "name"})
+    builder.instance_variable_get(:"@state").should == :display
+  end
+
+  describe "build attributes" do
+    it "should set through #with" do
+      builder.with("name","state").build_attributes.should == {:name => "name", :state => "state"}
+      builder.with({:name=>"name",:state=>"state"}).build_attributes.should == {:name => "name", :state=>"state"}
+      builder.with("name",:state=>"state").build_attributes.should == {:name=>"name",:state=>"state"}
+    end
+  end
+
+  it "should return default state when no build attributes given" do
+    builder.state.should == :display
+  end
+
+  it "should return build attributes state when given" do
+    builder.with(:state=>"state").state.should == :"state"
+  end
+
+  it "should return default name when no build name given" do
+    builder.name.should == :"/simple_object"
+  end
+
+  it "should return build name when given" do
+    builder.with(:name => "name").name.should == :"/simple_object/name"
+    builder.with(:name => "/name").name.should == :"/name"
+  end
+
+  describe "#build" do
+    it "should return array with name,state and options" do
+      builder.build.should == [:"/simple_object",:"display",{}]
+      builder.with({:display_value => 1}).build.should == [:"/simple_object",:display,{:display_value=>1}]
+    end
+  end
+
+  describe "conditions" do
+    it "should use given over default when there's no conditions" do
+      builder = klass.new(object,:name => "/custom", :state => "special")
+      builder.build.should == [:"/custom",:"special",{}]
+    end
+
+    it "should use given over default when conditions met" do
+      builder = klass.new(object, :name => "/custom", :state=>"special", :unless=>{:state=>"display"})
+      builder.build.should == [:"/simple_object",:"display",{}]
+      builder.class_eval do
+        def default_state
+          :other
+        end
+      end
+      builder.build.should == [:"/custom",:special,{}]
+    end
+
+    it "should use given over build given when conditions met" do
+      builder = klass.new(object,:name => "/custom", :"state" => "special", :if=>{:state=>"default"})
+      builder.with(:state => "other").build.should == [:"/simple_object",:other,{}]
+      builder.with(:state => :default).build.should == [:"/custom",:special,{}]
+    end
+  end
+end
+
 describe Lolita::Builder do
 
   let(:object){SimpleObject.new}
 
   describe "#build" do
-    it "should return default component information when no params passed" do
-      info=object.build
-      info.first.should == :"/simple_object"
-      info[1].should == :display
-      info.last.should have_key(:simple_object)
-    end
 
-    context "with instance builder" do
-      it "should use given one" do
-        object.builder="custom"
+    describe "default path" do
+
+      it "should be /:class_name/display" do
         info=object.build
-        info.first.should==:"/simple_object/custom"
+        info.first.should == :"/simple_object"
+        info[1].should == :display
+      end
+
+      it "should use given name when it starts with /" do
+        object.builder = {:name =>"/custom"}
+        info = object.build
+        info.first.should == :"/custom"
         info[1].should == :display
       end
 
-      it "should use that what #build receive" do
-        object.builder="custom"
-        info=object.build("other")
-        info.first.should == :"/simple_object/other"
+      it "should make name /:class_name/:custom_name when it doesn't start with /" do
+        object.builder = {:name => "custom"}
+        info = object.build
+        info.first.should == :"/simple_object/custom"
         info[1].should == :display
       end
+    
     end
 
-    it "should accept empty name" do
-      info=object.build("",:list)
-      info.first.should == :"/simple_object"
-      info[1].should == :list
+    it "should use received name" do
+      object.builder = {:name=>"/custom"}
+      info = object.build("/other_custom")
+      info.first.should == :"/other_custom"
     end
 
   end

data/spec/controllers/lolita_rest_spec.rb

@@ -40,7 +40,7 @@ describe Lolita::RestController do
     tab.type.should == :content
     tab.fields.by_name(:title).title = "foobar"
     get :new
-    response.body.should =~/foobar/
+    response.body.should match(/foobar/i)
   end
 
   it "should display inline error messages if validations fail"

data/spec/navigation/branch_spec.rb

@@ -51,7 +51,6 @@ describe Lolita::Navigation::Branch do
     it "should add before and after branch" do
       branch=tree.append(Object)
       first_branch=Lolita::Navigation::Branch.new
-      debugger
       first_branch.before(branch)
       last_branch=Lolita::Navigation::Branch.new
       last_branch.after(branch)

metadata

@@ -1,182 +1,180 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lolita
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.1.7
   prerelease: 
-  version: 3.1.6
 platform: ruby
-authors: 
+authors:
 - ITHouse (Latvia) and Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-19 00:00:00 +03:00
+date: 2011-06-10 00:00:00.000000000 +03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &76216020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76216020
+- !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &76215300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.11.0
+      - !ruby/object:Gem::Version
+        version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76215300
+- !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &76214830 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76214830
+- !ruby/object:Gem::Dependency
   name: builder
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &76214280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76214280
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &76213800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76213800
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &76213500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76213500
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &76213200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76213200
+- !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &76212630 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76212630
+- !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &76211740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76211740
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &76211450 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76211450
+- !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &76211100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76211100
+- !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &76210810 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76210810
+- !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &76210510 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76210510
+- !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &76210170 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id014
-description: "Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. "
+  version_requirements: *76210170
+description: ! 'Great Rails CMS, that turns your business logic into good-looking,
+  fully functional workspace. '
 email: support@ithouse.lv
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - GUIDELINES.rdoc
@@ -186,6 +184,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/lolita/info_controller.rb
 - app/controllers/lolita/rest_controller.rb
 - app/helpers/components/lolita/configuration/list_component.rb
 - app/helpers/lolita_helper.rb
@@ -238,6 +237,7 @@ files:
 - app/views/components/lolita/shared/_header.html.erb
 - app/views/components/lolita/shared/_right_sidebar.html.erb
 - app/views/layouts/lolita/application.html.erb
+- app/views/lolita/info/index.html.erb
 - app/views/lolita/rest/form.html.erb
 - app/views/lolita/rest/index.html.erb
 - author
@@ -309,6 +309,7 @@ files:
 - public/images/lolita/plus.png
 - public/javascripts/jquery-1.6.min.js
 - public/javascripts/jquery-ui-1.8.13.min.js
+- public/javascripts/lolita/application.js
 - public/javascripts/lolita/main.js
 - public/javascripts/lolita/tab.js
 - public/javascripts/modernizr-1.7.min.js
@@ -482,36 +483,34 @@ files:
 - spec/support/formatter_spec.rb
 has_rdoc: true
 homepage: http://github.com/ithouse/lolita
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 354459983
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 23472445
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Great Rails CMS.
-test_files: 
+test_files:
 - spec/adapter_helper.rb
 - spec/builder_spec.rb
 - spec/configuration/base_spec.rb