webs 0.1.6 → 0.1.7

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.6') do |p|
+Echoe.new('webs', '0.1.7') 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

@@ -11,6 +11,25 @@ module Webs
           helper Webs::Helper::Tags
           include Webs::Helper::Params
           include Webs::Helper::Tags
+          helper_method :webs_app_name
+          helper_method :webs_appenv_name
+        end
+      end
+      
+      def webs_app_name
+        app_name = APP_NAME if defined?(APP_NAME)
+        app_name ||= Webs::APP_NAME if defined?(Webs::APP_NAME)
+      end
+
+      def webs_appenv_name
+        unless defined?(Webs::USE_ENV_IN_APPNAME) && Webs::USE_ENV_IN_APPNAME == false
+          suffix = Rails.env
+          suffix = {'development' => 'dev', 'beta'=>'qa' }[suffix] || suffix
+          suffix = nil if suffix == 'production'
+          
+          "#{webs_app_name}#{'.'+suffix if !suffix.nil?}"
+        else
+          webs_app_name
         end
       end
 

data/lib/helper/params.rb

@@ -65,9 +65,8 @@ 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
-        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?
+        app_name = webs_appenv_name
+        raise "webs_app_url requires that the constant APP_NAME is defined.. for now..." if app_name.blank?
         "#{fw_sig_url}apps/#{app_name}"
       end
     end

data/lib/webs.rb

@@ -5,7 +5,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 
   module Permission
     DISABLED = -1

data/webs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webs
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Chuck Olczak