webs 0.1.11 → 0.1.12

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.11') do |p|
+Echoe.new('webs', '0.1.12') do |p|
   p.description    = "Reusable webs stuff."
   p.url            = "https://colczak@github.com/websdev/websgem.git"
   p.author         = "Chuck Olczak"

data/lib/config/webs_constants.rb

@@ -53,11 +53,11 @@ module Webs
       value_for_level( k ) >= v
     end
   end
-  
+
   module CommentsOrder
-    ASC   = 0
-    DESC  = 1
-    VIEWS = [[ASC, "Oldest first (default)"], [DESC, "Newest first"]]
+    DESC  = 0
+    ASC   = 1
+    VIEWS = [[DESC, "Newest first (default)"], [ASC, "Oldest first"]]
     SELECT_OPTIONS = VIEWS.map { |val, disp| [disp, val] }
     VAL_LIST  = VIEWS.map {|val, disp| val}
     def self.val_to_str(val)

data/lib/controller/webs_controller.rb

@@ -100,13 +100,16 @@ module Webs
         render(:text => "You are not authorized.") unless webs_admin?
       end
       
+      def require_sitebuilder
+        render( :text => "You are not an admin.", :status=>403 ) unless webs_sitebuilder?
+      end
+      
       def webs_site
         @webs_site
       end
       
       # options include primary_key_col
       def load_site_model modelname, options={}
-        Rails.logger.debug "load_site_model #{modelname} #{options.inspect}"
         model = modelname.constantize
         pk = options.delete(:primary_key_col)
         if pk
@@ -116,7 +119,6 @@ module Webs
         end
           
         rescue
-          Rails.logger.debug "!!!!!!!!!!!!!!!!!!! load_site_model Failed"
           nil
       end
       

data/lib/test/webs_test_helper.rb

@@ -0,0 +1,80 @@
+module Webs
+  module WebsTestHelper
+    def fw_test_params options={}
+      { :fw_sig_site=>rand(100000),
+        :fw_sig_is_admin=>'0',
+        :fw_sig_permission_level=>Webs::PermissionLevel[:anyone],
+        :fw_sig_tier=>'0',
+        :fw_sig_url=>'localhost:3000',
+        :fw_sig_user=>rand(100000),
+        :fw_sig_social=>'1', 
+        :fw_sig_premium=>'0',
+        :fw_sig_width=>800 }.merge( options )
+    end
+    
+    def fw_sitebuilder_test_params options={}
+      fw_test_params options.merge( :fw_sig_is_admin=>'1' )
+    end
+    
+    def fw_test_scenarios options={}
+      scenarios = []
+      fw_param_permuter( options ){ |params| scenarios << params }
+      scenarios
+    end
+    
+    # Permute: is_admin, permission_level, tier, social & premium
+    # fw_param_permuter( :only=>[:fw_sig_is_admin, :fw_sig_social, :fw_sig_permission_level] )
+    # fw_param_permuter( :except=>[:fw_sig_tier, :fw_sig_premium]} )
+    # fw_param_permuter( :vals=>{:test=>['a', 'b', 'c'] )
+    def fw_param_permuter options={}, &block
+      param_vals = {
+        :fw_sig_is_admin=>[0,1],
+        :fw_sig_permission_level=>Webs::PermissionLevel::VALUES,
+        :fw_sig_social=>[0,1],
+        :fw_sig_premium=>[0,1],
+        :fw_sig_tier=>[0,1,2,3]
+      }
+
+      if (only = options.delete(:only))
+        param_vals.keys.each { |k| param_vals.delete(k) if !only.include?(k)}
+      end
+      if (except = options.delete(:except))
+        param_vals.keys.each { |k| param_vals.delete(k) if except.include?(k)}
+      end
+      
+      if (vals = options.delete(:vals))
+        param_vals.merge!( vals ) 
+      end
+
+      params = fw_test_params( options ) 
+      permute_params params, param_vals, block
+    end
+    
+    def permute_params params, h_vals, block
+      if h_vals.size == 0
+        block.call( params.clone )
+      else
+        k = h_vals.keys.first
+        vals = h_vals.delete(k)
+        vals.each do |v|
+          params[k] = v.to_s
+          permute_params params, h_vals.clone, block
+        end
+      end
+    end
+    
+    def assert_difference(executable, how_many = 1, &block)
+      before = eval(executable)
+      yield
+      after = eval(executable)
+      after.should == before + how_many
+    end
+    
+    def assert_no_difference(executable, &block)
+      before = eval(executable)
+      yield
+      after = eval(executable)
+      after.should == before
+    end    
+  end
+end

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = "0.1.11".freeze
+  VERSION = "0.1.12".freeze
 
 #  def self.load_constants
     # s = File.read("#{Pathname(__FILE__).dirname.expand_path}/config/webs_constants.yml")

data/webs.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-01-28}
   s.description = %q{Reusable webs stuff.}
   s.email = %q{chuck@webs.com}
   gemfiles = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
       "lib/helper/tags.rb", 
       "lib/views/layouts/webs_page.html.erb", 
       "lib/views/layouts/webs_utility.html.erb", 
+      "lib/test/webs_test_helper.rb", 
       "lib/views/shared/_webs_info.html.erb" 
   ]
   s.extra_rdoc_files = gemfiles

metadata

@@ -1,21 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: webs
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
-  - 0
-  - 1
-  - 11
-  version: 0.1.11
+    - 0
+    - 1
+    - 12
+  version: 0.1.12
 platform: ruby
 authors: 
-- Chuck Olczak
+  - Chuck Olczak
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-01-28 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -26,72 +25,70 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
-- lib/webs.rb
-- lib/cache/cache.rb
-- lib/config/webs_constants.rb
-- lib/config/webs_initializer.rb
-- lib/controller/url_for_context_path.rb
-- lib/controller/webs_controller.rb
-- lib/helper/application.rb
-- lib/helper/params.rb
-- lib/helper/tags.rb
-- lib/views/layouts/webs_page.html.erb
-- lib/views/layouts/webs_utility.html.erb
-- lib/views/shared/_webs_info.html.erb
+  - README.rdoc
+  - lib/webs.rb
+  - lib/cache/cache.rb
+  - lib/config/webs_constants.rb
+  - lib/config/webs_initializer.rb
+  - lib/controller/url_for_context_path.rb
+  - lib/controller/webs_controller.rb
+  - lib/helper/application.rb
+  - lib/helper/params.rb
+  - lib/helper/tags.rb
+  - lib/views/layouts/webs_page.html.erb
+  - lib/views/layouts/webs_utility.html.erb
+  - lib/test/webs_test_helper.rb
+  - lib/views/shared/_webs_info.html.erb
 files: 
-- README.rdoc
-- lib/webs.rb
-- lib/cache/cache.rb
-- lib/config/webs_constants.rb
-- lib/config/webs_initializer.rb
-- lib/controller/url_for_context_path.rb
-- lib/controller/webs_controller.rb
-- lib/helper/application.rb
-- lib/helper/params.rb
-- lib/helper/tags.rb
-- lib/views/layouts/webs_page.html.erb
-- lib/views/layouts/webs_utility.html.erb
-- lib/views/shared/_webs_info.html.erb
-- Rakefile
-- webs.gemspec
+  - README.rdoc
+  - lib/webs.rb
+  - lib/cache/cache.rb
+  - lib/config/webs_constants.rb
+  - lib/config/webs_initializer.rb
+  - lib/controller/url_for_context_path.rb
+  - lib/controller/webs_controller.rb
+  - lib/helper/application.rb
+  - lib/helper/params.rb
+  - lib/helper/tags.rb
+  - lib/views/layouts/webs_page.html.erb
+  - lib/views/layouts/webs_utility.html.erb
+  - lib/test/webs_test_helper.rb
+  - lib/views/shared/_webs_info.html.erb
+  - Rakefile
+  - webs.gemspec
 has_rdoc: true
 homepage: http://github.com/websdotcom/websgem
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Webs
-- --main
-- README.rdoc
+  - --line-numbers
+  - --inline-source
+  - --title
+  - Webs
+  - --main
+  - README.rdoc
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 1
+          - 2
+        version: "1.2"
 requirements: []
 
 rubyforge_project: webs
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Reusable webs stuff.