webs 0.1.5 → 0.1.6

data/Rakefile

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

data/lib/controller/webs_controller.rb

@@ -25,10 +25,61 @@ module Webs
       # http://wiki.developers.webs.com/wiki/Verifying_Requests
       def webs_auth( secret )
         s = webs_auth_string
-        Rails.logger.debug "****************** WEBS AUTH STRING=> #{s}"
         Digest::MD5.hexdigest(webs_auth_string + secret)
       end
     
+      # mappings to http://wiki.beta.freewebs.com/index.php/Fw:member-level-select
+      def webs_member_level_to_int member_level
+        {
+          'anyone'=>Webs::Permission::ANYONE,
+          'limited'=>Webs::Permission::LIMITED,
+          'member'=>Webs::Permission::MEMBERS,
+          'moderator'=>Webs::Permission::MODERATORS,
+          'admin'=>Webs::Permission::ADMIN
+        }[member_level.downcase]
+      end      
+
+      # mappings of the select value of fw:member-level-select to the old int vals
+      # TODO: convert data to new vals, don't have time right now
+      def webs_member_level_value_to_old_member_level webs_member_level
+        {
+          '-255'=>Webs::Permission::ANYONE,
+          '25'=>Webs::Permission::LIMITED,
+          '50'=>Webs::Permission::MEMBERS,
+          '75'=>Webs::Permission::MODERATORS,
+          '100'=>Webs::Permission::ADMIN,
+          '125'=>Webs::Permission::OWNER,
+          '255'=>Webs::Permission::DISABLED
+        }[webs_member_level]
+      end
+
+      def webs_int_to_member_level n
+        {
+          Webs::Permission::DISABLED=>'disabled',
+          Webs::Permission::ANYONE=>'anyone',
+          Webs::Permission::LIMITED=>'limited',
+          Webs::Permission::MEMBERS=>'member',
+          Webs::Permission::MODERATORS=>'moderator',
+          Webs::Permission::ADMIN=>'admin',
+          Webs::Permission::OWNER=>'admin'
+        }[n]
+      end      
+
+      # converts level which is an int for the select options of a fw:member-level-select
+      # first to an associated Webs::Permission then to a blog member level
+      # TODO: This should be cleaned up and blogs should use the fw:member-level-select values
+      # the mapping is useful if you need to change the result, generally sending returning admin if owner
+      # since most of the apps use owner not admin
+      # The generally needs to be done in params since some objects contain validations
+      # example: 
+      #  convert_webs_member_level( params[:entries], :view_level, {Webs::Permission::ADMIN=>Webs::Permission::OWNER} )
+      #  will take a webs member-level-select and convert it to a  Webs::Permission mapping ADMIN to OWNER
+      def convert_webs_member_level h, key, mapping={}
+        return if h.nil?
+        v = webs_member_level_value_to_old_member_level( h[key] )
+        h[key] = mapping[v] || v
+      end
+
       # FILTERS
       def validate_webs_session
         render :text => "Access Denied: Webs::SECRET not defined." and return(false) unless defined?( Webs::SECRET )
@@ -42,6 +93,7 @@ module Webs
       def require_webs_admin
         render(:text => "You are not authorized.") unless webs_admin?
       end
+      
     end
   end
 end

data/lib/helper/params.rb

@@ -1,62 +1,11 @@
 module Webs
   module Helper
     module Params
-      def fw_sig
-        params[:fw_sig]
-      end  
-      
-      def fw_sig_site
-        params[:fw_sig_site]
-      end  
-      
-      def fw_sig_is_admin
-        params[:fw_sig_is_admin]
-      end  
-
-      def fw_sig_permission_level
-        params[:fw_sig_permission_level]
-      end  
-      
-      def fw_sig_session_key
-        params[:fw_sig_session_key]
-      end  
-      
-      def fw_sig_tier
-        params[:fw_sig_tier]
-      end  
-      
-      def fw_sig_permissions
-        params[:fw_sig_permissions]
-      end  
-      
-      def fw_sig_time
-        params[:fw_sig_time]
-      end  
-   
-      def fw_sig_api_key
-        params[:fw_sig_api_key]
-      end  
-   
-      def fw_sig_url
-        params[:fw_sig_url]
-      end  
-   
-      def fw_sig
-        params[:fw_sig]
-      end  
-   
-      def fw_sig_user
-        params[:fw_sig_user]
-      end  
-   
-      def fw_sig_width
-        params[:fw_sig_width]
-      end  
-   
-      def fb_sig_network
-        params[:fb_sig_network]
+      [:fw_sig, :fw_sig_site, :fw_sig_is_admin, :fw_sig_permission_level, :fw_sig_session_key, :fw_sig_tier, :fw_sig_permissions, :fw_sig_time, :fw_sig_api_key, 
+       :fw_sig_url, :fw_sig, :fw_sig_user, :fw_sig_width, :fw_sig_social, :fb_sig_network].each do |fw_param|
+         module_eval( "def #{fw_param.to_s}() params[:#{fw_param.to_s}] end" )
       end
-      
+               
       # Some basic useful methods
       def webs_admin_mode?
         fw_sig_is_admin == '1'
@@ -100,6 +49,10 @@ module Webs
         fw_sig_permissions && webs_permission == Permission::ANYONE
       end
       
+      def webs_social?
+        fw_sig_social == '1'
+      end
+      
       def webs_site_owner_or_admin?
         webs_admin? || webs_owner?
       end
@@ -112,8 +65,10 @@ module Webs
       # defined in a global var, usually in the respective env file, however APP_NAME should be moved to something
       # more elegant in the future.
       def webs_app_url
-        raise "fw_app_url requires that the constant APP_NAME is defined.. for now..." if !defined?(APP_NAME)
-        "#{fw_sig_url}apps/#{APP_NAME}"
+        app_name = APP_NAME if defined?(APP_NAME)
+        app_name ||= Webs::APP_NAME if defined?(Webs::APP_NAME)
+        raise "fw_app_url requires that the constant APP_NAME is defined.. for now..." if app_name.blank?
+        "#{fw_sig_url}apps/#{app_name}"
       end
     end
   end

data/lib/helper/tags.rb

@@ -7,10 +7,18 @@ module Webs
         return "<fw:#{tagname}#{s_options}/>" unless block
 
         content = capture(&block)
-        output = ActiveSupport::SafeBuffer.new
-        output.safe_concat("<fw:#{tagname}#{s_options}>")
-        output << content
-        output.safe_concat("</fw:#{tagname}>")
+        begin
+          # Rails 3
+          output = ActiveSupport::SafeBuffer.new
+          output.safe_concat("<fw:#{tagname}#{s_options}>")
+          output << content
+          output.safe_concat("</fw:#{tagname}>")
+        rescue
+          concat("<fw:#{tagname}#{s_options}>", block.binding)
+          concat( content, block.binding)
+          concat("</fw:#{tagname}>", block.binding)
+          
+        end
       end
       
       def webs_image_url img

data/lib/webs.rb

@@ -5,9 +5,10 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 
   module Permission
+    DISABLED = -1
     ANYONE = 0
     LIMITED = 1
     MEMBERS = 2
@@ -15,5 +16,6 @@ module Webs
     OWNER = 4
     ADMIN = 5
   end
+  
 end
 

data/webs.gemspec

@@ -2,15 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]
-  s.date = %q{2010-10-26}
+  s.date = %q{2010-11-04}
   s.description = %q{Reusable webs stuff.}
   s.email = %q{chuck@webs.com}
-  s.extra_rdoc_files = ["README.rdoc", "lib/controller/webs_controller.rb", "lib/helper/params.rb", "lib/helper/tags.rb", "lib/webs.rb", "lib/controller/webs_controller.rb", "lib/config/webs_initializer.rb"]
-  s.files = ["README.rdoc", "Rakefile", "lib/controller/webs_controller.rb", "lib/helper/params.rb", "lib/helper/tags.rb", "lib/webs.rb",  "lib/controller/webs_controller.rb", "lib/config/webs_initializer.rb", "webs.gemspec"]
+  gemfiles = [
+      "README.rdoc", 
+      "lib/webs.rb",  
+      "lib/config/webs_initializer.rb", 
+      "lib/controller/webs_controller.rb", 
+      "lib/helper/params.rb", 
+      "lib/helper/tags.rb", 
+  ]
+  s.extra_rdoc_files = gemfiles
+  s.files = gemfiles + [ "Rakefile", "webs.gemspec" ]
   s.homepage = %q{http://github.com/websdotcom/websgem}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Webs", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webs
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Chuck Olczak
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,19 +27,19 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- lib/webs.rb
+- lib/config/webs_initializer.rb
 - lib/controller/webs_controller.rb
 - lib/helper/params.rb
 - lib/helper/tags.rb
-- lib/webs.rb
-- lib/config/webs_initializer.rb
 files: 
 - README.rdoc
-- Rakefile
+- lib/webs.rb
+- lib/config/webs_initializer.rb
 - lib/controller/webs_controller.rb
 - lib/helper/params.rb
 - lib/helper/tags.rb
-- lib/webs.rb
-- lib/config/webs_initializer.rb
+- Rakefile
 - webs.gemspec
 has_rdoc: true
 homepage: http://github.com/websdotcom/websgem