ns_service_pack 0.1.6 → 0.1.7

data/CHANGELOG

@@ -2,6 +2,8 @@
 
 #==============History:
 #==0.1.7
+Fix and release 0.1.7
+
 
 #==0.1.6
 * Fix README 文件中的忘加Ns::的bug

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/ns_service_pack/client.rb

@@ -3,45 +3,48 @@ require 'rest_client'
 
 module Ns
   class Client
-    #delegate :new, :get, :post, :to=>RestClient::Resource TODO ??
-    def self.get(url = '', params = {})
-      #params TODO 
-      request('get', url, params)
+    def self.request(action = 'get', url = '', data_params = {})
+      #TODO 网路异常处理  #use RestClient now
+      #get specific handle FIXME
+      if action == 'get'
+        ps = data_params[:data].dup
+        ps.delete(:id)
+        url = Util.params_query(url, ps)
+      end
+      Rails.logger.debug "====#{action} to #{url} with params: #{data_params.inspect}"
+      puts "====#{action} to #{url} with params: #{data_params.inspect}"
+      json_response = RestClient.send(action, url, data_params)
+      result = JSON.parse(json_response)
+      result
     end
-
-    def self.post(url = '', params = {})
-      request('post', url, params)
+    
+    def self.config
+      ServiceConfig
     end
 
-    def self.put(url = '', params = {})
-      request('put', url, params)
+    def self.url(key = '', params = {})
+      config.service_url(key, params)
     end
-
-    def self.delete()
-      request('delete', url, params)
+    #service request
+    def self.service_request(service_key = '', params = {}, request_method = 'get')
+      request(request_method, url(service_key, params[:data]), params)
     end
-
-    def self.request(action = 'get', url = '', data_params = {})
-      #TODO 网路异常处理
-      #use RestClient now
-      json_response = RestClient.send(action, url, :data=>data_params)
-      result = unpack(json_response)
-      if result.ok?
-        return result.data.symbolize_keys if result.data.is_a?(Hash)
-        result.data
-      else
-        raise ResultError.new(result)
-      end
+    
+    #==service端统一从:data参数中接传来的额外请求数据
+    def self.get(key = '', params = {})
+      service_request(key, {:data=>params}, 'get')
+    end
+    
+    def self.delete(key = '', params = {})
+      service_request(key, {:data=>params}, 'delete')
     end
     
-    def self.ajax_request(action = 'get', url = '', data_params = {})
-      #TODO 网路异常处理
-      json_response = RestClient.send(action, url, :data=>data_params)
-      #render :json=>json_response
+    def self.post(key = '', params = {})
+      service_request(key, {:data=>params}, 'post')
     end
 
-    def self.unpack(json_response_str = nil)
-      Result.new(JSON.parse(json_response_str))
+    def self.put(key = '', params = {})
+      service_request(key, {:data=>params}, 'put')
     end
   end
 end

data/lib/ns_service_pack/field_mapping.rb

@@ -133,13 +133,13 @@ module Ns
         end
         
         if mapping_hash.present?
-          cond_str << " and "
+          cond_str << " and " unless cond_str.blank?
           cond_str << mapping_hash.map do |buz_key, db_key|
             "#{db_key} = :#{buz_key}"
           end.join(" and ")
         end
         unless erp_admin?(params) && mapping.keys.include?(:status)
-          cond_str << " and " if cond_str.present?
+          cond_str << " and " unless cond_str.blank?
           cond_str << " #{mapping[:status]} != -1"  #TODO FIXME -1 use
         end
         
@@ -225,6 +225,7 @@ module Ns
      
       #业务层到数据层字段参数转换并做一定值处理
       def db_hashize(params = {})
+        return {} if params.blank?
         new_params = params.symbolize_keys
         common_keys = new_params.keys & mapping.keys
         common_keys.inject({}) do |result, key|

data/lib/ns_service_pack/service_config.rb

@@ -26,5 +26,18 @@ module Ns
       end #/if
       @@services
     end #/def
-  end
-end
+    
+    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 ''
+      if force_sub && params[:id]
+        the_url.sub!(':id', params[:id].to_s)
+      end
+      #TODO REMOVE THIS 
+      if force_sub && params[:customer_id]
+        the_url.sub!(':customer_id', params[:customer_id].to_s)
+      end
+      block_given? ? yield(the_url) : the_url
+    end
+  end #class
+end #module

data/lib/ns_service_pack/util.rb

@@ -3,12 +3,30 @@ require 'fileutils'
 module Ns
   module Util
     extend self 
+    
     def concat_url(prefix_url = '', url = '')
       prefix_url = prefix_url.to_s
       sep = (prefix_url[-1, 1] == '/' || url[0, 1] == '/') ? '' : '/'
       "#{prefix_url}#{sep}#{url}"
     end
-  
+
+    def params_query(base_url = '', query_params = {})
+      query_str = query_params.respond_to?(:to_query) ? query_params.to_query : query_params.to_a.map{|a| a.join('=')}.join('&')
+      base_url = base_url.to_s
+      unless query_str.blank?
+        sep = if base_url[-1, 1] =~ /\?|&/ 
+                ''
+              else
+                if base_url.include?('?')
+                  '&'
+                else
+                  '?'
+                end
+              end
+      end
+      "#{base_url}#{sep}#{query_str}"
+    end
+
     #将一个hash和array写入data下的yaml结构中
     def yamlize(hash_or_array = {}, file_name = nil)
       return if hash_or_array.nil?

data/ns_service_pack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ns_service_pack"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Caory, Shang, Geogeous"]
-  s.date = "2011-12-07"
+  s.date = "2011-12-17"
   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.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &85246320 !ruby/object:Gem::Requirement
+  requirement: &82356530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *85246320
+  version_requirements: *82356530
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &85246000 !ruby/object:Gem::Requirement
+  requirement: &82356120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *85246000
+  version_requirements: *82356120
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &85245700 !ruby/object:Gem::Requirement
+  requirement: &82355630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85245700
+  version_requirements: *82355630
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85245420 !ruby/object:Gem::Requirement
+  requirement: &82355350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *85245420
+  version_requirements: *82355350
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85245180 !ruby/object:Gem::Requirement
+  requirement: &82354930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *85245180
+  version_requirements: *82354930
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &85244940 !ruby/object:Gem::Requirement
+  requirement: &82354540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85244940
+  version_requirements: *82354540
 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: -447924557
+      hash: 896815169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: