xforum 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa8a9801c65c8378e2dada2148c71f10e8c2345
-  data.tar.gz: 24d364fe9aff810ce12ae25f5f250f4b579e5c95
+  metadata.gz: fc117ec03d67331b03463b23ad6bd5f7a497e442
+  data.tar.gz: 9ea7c11c3b567a1af0265c3c08d13dc51facb1f8
 SHA512:
-  metadata.gz: 5bc456f9dba77b0210c6e32501e690368d1a1012142722c41b8624d5c4e1d18f2ba5dc32e059e28d719040ff65e394ba35503ee51adf255b42adf4dedcdf6feb
-  data.tar.gz: ec01ef886bc872f616270f4d54304596de545ea27b1482fe75e8ffebf36aa4b7ae0286bb5e6fedf744ecd11e93225150fbdb8a23b1f87104cdffe7bd97cd675c
+  metadata.gz: f5e609daa43c2f2ea42740b402dc8ab08de6623397426bb81abc4fc87aba334323643cb28756f970c8dbb460dc47b0f69abec8f8f299843a7478b7c7e7a29140
+  data.tar.gz: a6251e7c28d92c1785df25b1d92fa7842bfb78a74caca2bcc9ef31eb7e32c4f1fe2177f5cfb445d789ba149d5a3d06b5fa5ddc18f12247a4b48c1172aa28490f

data/app/models/xforum/category.rb

@@ -60,8 +60,8 @@ module Xforum
         Category.create(name:'select category',closed:false,suggestion:false)
       end
       params[:hold_test]=='true' ?
-          category_list= ForumAssist.named_array(Category.where(closed:false,suggestion:false).pluck(:id,:name,:closed,:restricted),[:id,:name,:closed,:restricted])   :
-          category_list= ForumAssist.named_array(Category.all.pluck(:id,:name,:closed,:restricted),[:id,:name,:closed,:restricted])
+          category_list= Category.grab({closed:false,suggestion:false},[:id,:name,:closed,:restricted],{})   :
+          category_list= Category.grab('all',[:id,:name,:closed,:restricted],{})
       category_list=ForumAssist.make_last(category_list.clone, {key: :id,ref:Category.where(name:'request new category').pluck(:id)[0]})
       category_list=ForumAssist.make_first(category_list.clone,{key: :id,ref:Category.where(name:'select category').pluck(:id)[0]})
       category_list=PeopleList.check_restrictions(category_list.clone,user,'categories') unless user.forum_admin?

data/app/models/xforum/forum.rb

@@ -64,7 +64,7 @@ module Xforum
           if senate_list.nil? || senate_list.empty?
             []
           else
-            voting=ForumAssist.named_array(Topic.where(id:topic_id).pluck(:vote,:votes),[:vote,:votes])[0]
+            voting=Topic.grab({id:topic_id},[:vote,:votes],{})[0]
             voting[:vote] ? votes=Topic.count_votes(JSON.load(voting[:votes])) : votes=0
             parent=Forum.look_for_key(senate_list,:parent,0)
             new_list=[]
@@ -90,7 +90,7 @@ module Xforum
     end
 
     def self.clear_user_topic(user_id,topic_id)
-      comments=ForumAssist.named_array(Forum.where(topic_id:topic_id).order(:tag).pluck(:id,:tag),[:id,:tag])
+      comments=Forum.grab({topic_id:topic_id},[:id,:tag],{order:[:tag]})
       tags=[]
       test_comments=comments.clone
       test_comments.each{ |comment|

data/app/models/xforum/photo.rb

@@ -28,7 +28,7 @@ module Xforum
 
     def self.get_photo(params)
       params[:id].nil? || params[:id] == '' ? which = {tag:params[:tag]}  : which = {id:params[:id]}
-      data=ForumAssist.named_array(Forum.where(which).pluck(:id,:parent),[:id,:parent])[0]
+      data=Forum.grab(which,[:id,:parent],{})[0]
       urls=Photo.get_photos(data[:id])
       {tag:params[:tag],edit:params[:edit],urls:urls,id:data[:id],parent:data[:parent],count:params[:count].to_i+1}
     end

data/app/models/xforum/topic.rb

@@ -15,12 +15,12 @@ module Xforum
       unless  params[:category] == 'select category'
         category_id=Category.where(name:params[:category]).pluck(:id)[0]
         params[:hold_test]=='true' ?
-            topics=ForumAssist.named_array(Topic.where(category_id:category_id,closed:false,suggestion:false).pluck(:id,:name,:state,:restricted,:closed),  [:id,:item,:state,:restricted,:closed])  :
-            topics=ForumAssist.named_array(Topic.where(category_id:category_id).pluck(:id,:name,:state,:restricted,:closed),  [:id,:item,:state,:restricted,:closed])
+            topics=Topic.grab({category_id:category_id,closed:false,suggestion:false},  [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})  :
+            topics=Topic.grab({category_id:category_i}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})
         topics=[] if topics[0][:id].nil?
         topics=PeopleList.check_restrictions(topics,user,'topic') unless user.forum_admin?
-        a=ForumAssist.named_array(Topic.where(name:'select topic').pluck(:id,:name,:state,:restricted,:closed),   [:id,:item,:state,:restricted,:closed])[0]
-        b=ForumAssist.named_array(Topic.where(name:'request new topic').pluck(:id,:name,:state,:restricted,:closed), [:id,:item,:state,:restricted,:closed])[0]
+        a=Topic.grab({name:'select topic'},[:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
+        b=Topic.grab({name:'request new topic'}, [:id,:name,:state,:restricted,:closed],{swap:{name: :item}})[0]
         topics.unshift(a)
         topics.push(b)
         {list_data:Translation.translate_list(topics,params[:language],'topic'),id:params[:list]}

data/app/models/xforum/translation.rb

@@ -1,3 +1,16 @@
+#     forum_id       t.integer
+#     user_id        t.integer
+#     topic_id       t.integer
+#     category_id    t.integer
+#     language_id    t.integer
+#     hyperlink_id   t.integer
+#     suggestion,    t.boolean               default: false
+#     state,         t.string     limit: 20, default: new
+#     content        t.text
+#     resolution     t.text
+#     created_at     t.datetime
+#     updated_at     t.datetime
+
 
 module Xforum
   class Translation < ActiveRecord::Base
@@ -9,7 +22,7 @@ module Xforum
 
     def self.translate_to(list)
       list.each{|entry|
-        translations=ForumAssist.named_array(Translation.where(forum_id:entry[:id]).pluck(:language,:content),[:language,:content])
+        translations=AssitMe.named_array(Translation.where(forum_id:entry[:id]).pluck(:language,:content),[:language,:content])
         entry.store(:translations,translations)
       }
       list
@@ -52,9 +65,11 @@ module Xforum
 
     # noinspection RubyLiteralArrayInspection
     def self.get_translations(params)
-      language = Language.get_me(params)
-      topic = Topic.where(name:params[:topic]).pluck(:id)[0]
-      ForumAssist.named_array(Translation.where(topic_id:topic,language_id:language,state:['new','open']).pluck(:forum_id,:content,:suggestion),[:forum_id,:translation,:suggestion])
+      language_id = Language.get_me(params)
+      topic_id = Topic.where(name:params[:topic]).pluck(:id)[0]
+      ForumAssist.named_array(Translation.where(topic_id:topic_id,language_id:language_id,state:['new','open']).pluck(:forum_id,:content,:suggestion),[:forum_id,:item,:suggestion])
+      #Translation.grab({topic_id:topic_id,language_id:language_id,state:['new','open']},[:forum_id,:item,:suggestion],{swap:{name: :item}})
+
     end
 
     def self.add_one(params,topic_id,user_id,forum_id)

data/lib/active_record_extension.rb

@@ -0,0 +1,69 @@
+module ActiveRecordExtension
+
+  extend ActiveSupport::Concern
+
+  # add your instance methods here
+  def foo
+    "foo"
+  end
+
+  # add your static(class) methods here
+  module ClassMethods
+    def grab(which,what,options)
+      pluck=Assist.make_string_list(what)
+      unless options[:swap].nil?
+        swaps=options[:swap]
+        swaps.each_key { |key|
+          index=what.index(key.to_sym)
+          what[index]=swaps[key.to_sym]
+        }
+      end
+      order=Assist.make_string_list(options[:sort]) unless options.nil? || options[:sort].nil?
+      if which=='all'
+        order.nil?  ?
+            Assist.named_array(self.all.pluck(pluck),what) :
+            Assist.named_array(self.all.order(order).pluck(pluck),what)
+      else
+        order.nil? ?
+            Assist.named_array(self.where(which).pluck(pluck),what) :
+            Assist.named_array(self.where(which).order(order).pluck(pluck),what)
+      end
+    end
+  end
+
+  module Assist
+
+    def self.make_string_list(alist)
+      plucking=''
+      alist.each {|entry|
+        plucking.concat(',' ) unless plucking==''
+        plucking.concat(entry.to_s)
+      }
+      plucking
+    end
+
+    def self.named_array(data,what)
+      data = Array.new(what.size,nil)  if data.nil? || data.empty?
+      if  data.size==1
+        double=true
+        data.push(data[0])
+      end
+      pseudo= !data[0].is_a?(Array)  && what.size>1
+      temp=Array.new{{}}
+      pseudo ? size=1 : size=data.size
+      (0...size).each {|i|
+        temp[i]={}
+        datax=data[i]
+        (0...what.size).each { |j|
+          pseudo ? temp[i].store(what[j], data[j]) : temp[i].store(what[j], datax[j]) }
+        Rails.logger.debug 'hello'
+      }
+      temp.shift if double
+      temp
+    end
+
+  end
+end
+
+# include the extension
+ActiveRecord::Base.send(:include, ActiveRecordExtension)

data/lib/xforum/engine.rb

@@ -1,4 +1,5 @@
 module Xforum
+  require "active_record_extension"
   class Engine < ::Rails::Engine
     isolate_namespace Xforum
 

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -220,6 +220,7 @@ files:
 - db/migrate/20140601_create_forum_forums.rb
 - db/migrate/20140602_add_restricted_to_category.rb
 - db/migrate/20140602_change_suggestion_default.rb
+- lib/active_record_extension.rb
 - lib/tasks/xforum_tasks.rake
 - lib/xforum.rb
 - lib/xforum/engine.rb
@@ -275,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"