ns_service_pack 0.1.7 → 0.1.8

data/CHANGELOG

@@ -1,10 +1,12 @@
 #== TODO
 
 #==============History:
+#==0.1.8
+Fix FieldMapping#arrayify_conds的status字段加入条件
+
 #==0.1.7
 Fix and release 0.1.7
 
-
 #==0.1.6
 * Fix README 文件中的忘加Ns::的bug
 * 增大page_size的每页限制，原来250改为5000

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/ns_service_pack/field_mapping.rb

@@ -138,9 +138,16 @@ module Ns
             "#{db_key} = :#{buz_key}"
           end.join(" and ")
         end
-        unless erp_admin?(params) && mapping.keys.include?(:status)
-          cond_str << " and " unless cond_str.blank?
-          cond_str << " #{mapping[:status]} != -1"  #TODO FIXME -1 use
+        #如有status字段
+        if mapping.keys.include?(:status)
+          Rails.logger.debug "=======include status"
+          #如非erp admin后台请求
+          unless erp_admin?(params) 
+            cond_str << " and " unless cond_str.blank?
+            cond_str << " #{mapping[:status]} != -1"  #TODO FIXME -1 use
+          end
+        else
+          Rails.logger.debug "=======not include status"
         end
         
         result_array << cond_str

data/lib/ns_service_pack/service_config.rb

@@ -29,7 +29,9 @@ module Ns
     
     def self.service_url(service_key = '', params = {}, force_sub = true)
       #fixed a bug here, using dup to avoid modify the original templages
-      the_url = services[service_key.to_sym].to_s.dup rescue ''
+      url_key = service_key.to_sym
+      raise "Not found key:#{url_key} in the config file:#{SERVICE_CONFIG_FILE}" unless @@services.key?(url_key)
+      the_url = services[url_key].to_s.dup rescue ''
       if force_sub && params[:id]
         the_url.sub!(':id', params[:id].to_s)
       end

data/lib/ns_service_pack/version.rb

@@ -1,5 +1,5 @@
 #coding: utf-8
 module NsServicePack 
   puts "Warnign: TODO USE JEWELER DEFAULT VERSION MECHANISM NOW!"
-  VERSION = '0.0.16'
+  VERSION = '0.1.7'
 end

data/ns_service_pack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ns_service_pack"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caory, Shang, Geogeous"]
-  s.date = "2011-12-17"
+  s.date = "2011-12-20"
   s.description = "abstract some common pattern to service pack"
   s.email = "cao7113@hotmail.com"
   s.executables = ["nsp"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns_service_pack
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000Z
+date: 2011-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &82356530 !ruby/object:Gem::Requirement
+  requirement: &77441410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *82356530
+  version_requirements: *77441410
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &82356120 !ruby/object:Gem::Requirement
+  requirement: &77441150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *82356120
+  version_requirements: *77441150
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &82355630 !ruby/object:Gem::Requirement
+  requirement: &77440900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82355630
+  version_requirements: *77440900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82355350 !ruby/object:Gem::Requirement
+  requirement: &77440610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82355350
+  version_requirements: *77440610
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82354930 !ruby/object:Gem::Requirement
+  requirement: &77440340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82354930
+  version_requirements: *77440340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &82354540 !ruby/object:Gem::Requirement
+  requirement: &77440080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82354540
+  version_requirements: *77440080
 description: abstract some common pattern to service pack
 email: cao7113@hotmail.com
 executables:
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 896815169
+      hash: 78328239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: