ns_service_pack 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,8 +1,19 @@
+#== TODO
+
 #==============History:
+#==0.1.7
+
+#==0.1.6
+* Fix README 文件中的忘加Ns::的bug
+* 增大page_size的每页限制，原来250改为5000
+* mapping列表中移除键值中的mapping
+* 查找时提供select支持
+* 增加业务删除接口支持: destroy
+* Fix oracle 引用的bug
+
 #==0.1.4
 * 移除layout中对主项目中application js/css的调用
 
-
 #==0.1.3
 * 为内置视图添加layout
 * 添加对以前版本的兼容（load mapping时的键值变化）

data/README.rdoc

@@ -36,8 +36,8 @@
 
 * 获取最新版本:       gem install ns_service_pack
 * rails项目根目录下： nsp install && bundle install(此步检查下Gemfile，确保引用最新，或gem 'ns_service_pack', '~>0.1')
-* 相关Models中明确引用： include FieldMapping
-* ApplicationController或！子类！中添加引用： include ControllerServicable
+* 相关Models中明确引用： include Ns::FieldMapping
+* ApplicationController或！子类！中添加引用： include Ns::ControllerServicable
 
 # 验证是否成功？
 * 访问： http://service_post:port/， 非生产环境会重定向到/interfaces, 点击示例中的链接（动态生成）

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/app/views/ns/info/mappings.html.erb

@@ -5,7 +5,7 @@
     <%if v.is_a?(Hash)%>
       <%v.each_with_index do |e1, i|%>
         <tr>
-          <td>  <%= i==0 ? k : ''%></td>
+          <td>  <%= i==0 ? k.to_s.gsub('_mapping', '') : ''%></td>
           <td>  <%= e1[0]%>       </td>
           <td>  <%= e1[1]%>       </td>
         </tr>

data/lib/generators/ns/scaffold/scaffold_generator.rb

@@ -29,7 +29,7 @@ class Ns::ScaffoldGenerator < Rails::Generators::ScaffoldGenerator
     #TODO MOVE dev interface TO this gem controller
     gsub_file('config/routes.rb', /^\s*resources :#{plural_name}$/) do
       <<-Doc 
-  resources :#{plural_name}, :except=>[:edit, :destroy] 
+  resources :#{plural_name}, :except=>[:edit] 
       Doc
     end
   end 

data/lib/ns_service_pack/client.rb

@@ -18,6 +18,7 @@ module Ns
     end
 
     def self.delete()
+      request('delete', url, params)
     end
 
     def self.request(action = 'get', url = '', data_params = {})
@@ -32,6 +33,12 @@ module Ns
         raise ResultError.new(result)
       end
     end
+    
+    def self.ajax_request(action = 'get', url = '', data_params = {})
+      #TODO 网路异常处理
+      json_response = RestClient.send(action, url, :data=>data_params)
+      #render :json=>json_response
+    end
 
     def self.unpack(json_response_str = nil)
       Result.new(JSON.parse(json_response_str))

data/lib/ns_service_pack/controller_servicable.rb

@@ -2,55 +2,24 @@
 module Ns
   module ControllerServicable
     def index
-      @result = paginate(params) do |start, page_size|
+      @result = model_class.paginate(params) do |start, page_size|
         get_page_data(start, page_size, params)
       end
       render :json=>ResultPacker.data(@result.as_json)
     end
-
+    
     #return [total_count, page_data]
     #可在子类中覆盖定制
     def get_page_data(start = 0, size = 10, params = {})
-      where_conds = if @conds.present?
-        @conds
-      else
-        query_conditionize(params, @conds)
-      end
+      where_conds = @conds.present? ? @conds : model_class.arrayify_conds(params)
       logger.debug "====>conds: #{where_conds.inspect}"
       conds = {:conditions=>where_conds}
       total_count = model_class.count(conds)
-      page_params = conds.merge!(:offset=>start, :limit=>size, :order=>params[:order])
+      page_params = conds.merge!(:select=>model_class.select_fields(params[:select]), 
+                                 :offset=>start, :limit=>size, :order=>params[:order])
       page_data = model_class.all(page_params)
       [total_count, page_data]
     end
-
-    def query_conditionize(params = {}, conds = {})
-      #清除空条件
-      params.delete_if{|k, v| v.blank? }
-      #TODO 有@conds时如何融入？？？
-      #hash结构
-      conds = model_class.db_hashize(params)
-    end
-
-    #分页方法 # 加入文档说明
-    def paginate(params = {})
-      current_page = params[:current_page].to_i
-      current_page = current_page < 1 ? 1 : current_page
-      page_size = params[:page_size].to_i
-      page_size = page_size <= 0 ? 10 : page_size
-      page_size = page_size > 250 ? 250 : page_size
-      offset = (current_page-1)*page_size
-      #返回总数和当前页数据           起始位置， 数量
-      total_count, page_data =  yield(offset, page_size)
-      {
-       :total_size=>total_count,
-       :page_size=>page_size,
-       :current_page=>current_page,
-       :page_from=>offset + 1,
-       :page_to=>offset + page_data.size,
-       :page_items=>page_data
-      }
-    end
     
     #get a new buz obj with db default value
     def new
@@ -60,15 +29,15 @@ module Ns
     
     #查找单条记录
     def show
-      @_obj = model_class.find(params[:id])
-      render :json=>ResultPacker.data(@_obj.as_json)
+      @_obj = model_class._find_resource(params)
+      render :json=>ResultPacker.data(@_obj, "获取#{model_class.name}##{@_obj.respond_to?(:id) ? @_obj.id : @_obj.object_id}成功！")
     end
-    
+
     #创建记录
     def create
       @_obj = model_class.new_from_buz(params[:data]) 
       if @_obj.save
-        render :json=>ResultPacker.data(@_obj)
+        render :json=>ResultPacker.data(@_obj, "创建#{model_class.name}##{@_obj.respond_to?(:id) ? @_obj.id : @_obj.object_id}成功！")
       else
         render :json=>ResultPacker.help(valid_errors(model_class.buz_hashize(@_obj.errors.to_hash)))
       end
@@ -78,12 +47,27 @@ module Ns
     def update
       @_obj = model_class.find(params[:id])
       if @_obj.update_from_buz(params[:data])
-        render :json=>ResultPacker.data(@_obj)
+        render :json=>ResultPacker.data(@_obj, "更新#{model_class.name}##{@_obj.respond_to?(:id) ? @_obj.id : @_obj.object_id}成功！")
       else
         render :json=>ResultPacker.help(valid_errors(model_class.buz_hashize(@_obj.errors.to_hash)))
       end
     end
     
+    #更新记录 # 在获取时要做过滤判断!! TODO
+    def destroy
+      @_obj = model_class.find(params[:id])
+      if model_class.mapping.keys.include?(:status) && !params.key?(:force_del)
+        if @_obj.update_from_buz(:status=>'作废')
+          render :json=>ResultPacker.data(@_obj, "该记录已被逻辑删除（状态标记为：作废！）")
+        else
+          render :json=>ResultPacker.help(valid_errors(model_class.buz_hashize(@_obj.errors.to_hash)))
+        end
+      else
+        @_obj.destroy
+        render :json=>ResultPacker.data(@_obj, "警告：资源(#{model_class.name}##{@_obj.respond_to?(:id) ? @_obj.id : @_obj.object_id})已被物理删除！此资源不具备逻辑删除条件具有status业务属性或被内部强制删除！")
+      end
+    end
+    
     protected 
       #验证错误回传
       def valid_errors(error_hash = {})

data/lib/ns_service_pack/field_mapping.rb

@@ -40,8 +40,119 @@ module Ns
     def update_from_buz(params={})
       update_attributes(self.class.db_hashize(params))
     end
+
+    #获取对象的某个属性的业务值
+    def buz_value(buz_attr = nil)
+      result = nil
+      if buz_attr
+        db_key = self.class.mapping[buz_attr.to_sym]
+        if db_key
+          db_value = send(db_key)
+          #TODO BETTER
+          result = self.class.buz_hashize(db_key=>db_value)[buz_attr.to_sym]
+        end
+      end
+      result
+    end
+
+    def erp_admin?(params = {})
+      self.class.erp_admin?(params)
+    end
     
     module ClassMethods
+
+      def _find_resource(params = {})
+        obj = find(params[:id])
+        if mapping.keys.include?(:status) && !erp_admin?(params)
+          buz_value = get_map_value(:status, obj.send(mapping[:status]))
+          if buz_value == '作废'
+            raise "资源#{name}##{obj.object_id}已经作废不可用！"
+          end
+        end
+        obj
+      end
+
+      #convert buz array to db array
+      def dbize_array(buz_array = [])
+        result = nil
+        if buz_array && buz_array.is_a?(Array)
+          result = buz_array.map do |e| 
+            db_key = mapping[e.to_sym] rescue nil
+          end.compact
+        end
+        result
+      end
+      
+      def select_fields(array = [])
+        db_keys = dbize_array(array) || mapping.values 
+        #FIXME 添加是否是数据属性的判断 better
+        attrs = new.attributes.keys.map(&:to_sym)
+        db_keys & attrs 
+      rescue nil
+      end
+
+      #分页方法 # 加入文档说明
+      def paginate(params = {})
+        current_page = params[:current_page].to_i
+        current_page = current_page < 1 ? 1 : current_page
+        page_size = params[:page_size].to_i
+        page_size = page_size <= 0 ? 10 : page_size
+        #increment the limit
+        page_size = page_size > 5000 ? 5000 : page_size
+        offset = (current_page-1)*page_size
+        #返回总数和当前页数据           起始位置， 数量
+        total_count, page_data =  yield(offset, page_size)
+        {
+         :total_size=>total_count,
+         :page_size=>page_size,
+         :current_page=>current_page,
+         :page_from=>offset + 1,
+         :page_to=>offset + page_data.size,
+         :page_items=>page_data
+        }
+      end
+
+      #将外界条件转化为一个数组
+      def arrayify_conds(params = {})
+        #清除空条件
+        params.delete_if{|k, v| v.blank? }
+       
+        field_hash = {}
+        mapping_hash = {}
+        params.each do |k, v|
+          the_key = k.to_sym
+          if mapping.keys.include?(the_key)
+            field_hash[the_key] = get_map_value(the_key, v)
+            mapping_hash[the_key] = mapping[the_key]
+          end
+        end
+        result_array = []
+        cond_str = ""
+        if params[:extra_where_sql]
+          cond_str << params[:extra_where_sql].to_s
+        end
+        
+        if mapping_hash.present?
+          cond_str << " and "
+          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 << " #{mapping[:status]} != -1"  #TODO FIXME -1 use
+        end
+        
+        result_array << cond_str
+        result_array << field_hash
+        result_array
+      end
+
+      #@params invoke_src: erp_admin
+      def erp_admin?(params = {})
+        params[:invoke_src] == 'erp_admin'
+      end
+
       #Fix a bug on 20111117 by shang, this override the original method name
       def __model_clazz_name
         self.name.underscore

data/lib/ns_service_pack/global_const.rb

@@ -1,4 +1,4 @@
-#coding: utf-8
+#encoding: utf-8
 =begin
 * 20111115 find bug
   避免每次重新生成CodeHash的对象

data/lib/templates/config/initializers/oracle_db_config.rb

@@ -4,7 +4,7 @@
 # It is recommended to set time zone in TZ environment variable so that the same timezone will be used by Ruby and by Oracle session
 #ENV['TZ'] = 'UTC'
 
-if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
+if defined?(ActiveRecord::ConnectionAdapters::OracleEnhancedRailtie)
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.class_eval do
       # id columns and columns which end with _id will always be converted to integers

data/ns_service_pack.gemspec

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