megam_api 1.5.rc5 → 1.5.rc7

data/lib/megam/api/accounts.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /accounts

data/lib/megam/api/assemblies.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /nodes

data/lib/megam/api/assembly.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_one_assembly(asm_id)

data/lib/megam/api/balances.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_balances

data/lib/megam/api/billedhistories.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_billedhistories

data/lib/megam/api/billingtransactions.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_billingtransactions

data/lib/megam/api/components.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_components(comp_id)

data/lib/megam/api/domains.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
 

data/lib/megam/api/errors.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
     class API
         module Errors

data/lib/megam/api/eventsbilling.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /nodes

data/lib/megam/api/eventscontainer.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /nodes

data/lib/megam/api/eventsstorage.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /nodes

data/lib/megam/api/eventsvm.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /nodes

data/lib/megam/api/marketplaces.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
 

data/lib/megam/api/organizations.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_organizations

data/lib/megam/api/promos.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
 

data/lib/megam/api/requests.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
 

data/lib/megam/api/sensors.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_sensors

data/lib/megam/api/snapshots.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     # GET /nodes

data/lib/megam/api/sshkeys.rb

@@ -1,18 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
     def get_sshkeys

data/lib/megam/api/version.rb

@@ -1,20 +1,5 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class API
-    VERSION = "1.5.rc5"
+    VERSION = "1.5.rc7"
   end
 end

data/lib/megam/core/account.rb

@@ -1,32 +1,17 @@
-# Copyright:: 2013-2016 Megam Systems, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
   class Account < Megam::RestAdapter
     def initialize(o)
       @id = nil
       @email = nil
       @api_key = nil
-      @first_name = nil
-      @last_name = nil
+      @name = nil
       @phone = nil
       @password = nil
-      @authority = nil
-      @password_reset_key = nil
-      @password_reset_sent_at = nil
-      @created_at = nil
+      @states = nil
+      @approval = nil
+      @suspend = nil
+      @registration_ip_address = nil
+      @dates = nil
       @some_msg = {}
       super({:email => o[:email], :api_key => o[:api_key], :host => o[:host], :password => o[:password], :org_id => o[:org_id]})
     end
@@ -60,19 +45,42 @@ module Megam
       end
     end
 
-    def first_name(arg=nil)
+    def name(arg=nil)
       if arg != nil
+        @name = arg
+      else
+      @name
+      end
+    end
+    def first_name(arg = nil)
+      if !arg.nil?
         @first_name = arg
       else
-      @first_name
+        @first_name
       end
     end
 
-    def last_name(arg=nil)
-      if arg != nil
+    def last_name(arg = nil)
+      if !arg.nil?
         @last_name = arg
       else
-      @last_name
+        @last_name
+      end
+    end
+
+    def phone(arg=nil)
+      if arg != nil
+        @phone = arg
+      else
+      @phone
+      end
+    end
+
+    def phone_verified(arg=nil)
+      if arg != nil
+        @phone_verified = arg
+      else
+      @phone_verified
       end
     end
 
@@ -92,11 +100,12 @@ module Megam
       end
     end
 
-    def authority(arg=nil)
+
+    def password(arg=nil)
       if arg != nil
-        @authority = arg
+        @password = arg
       else
-      @authority
+      @password
       end
     end
 
@@ -108,7 +117,7 @@ module Megam
       end
     end
 
- def password_reset_sent_at(arg=nil)
+  def password_reset_sent_at(arg=nil)
       if arg != nil
         @password_reset_sent_at = arg
       else
@@ -116,6 +125,157 @@ module Megam
       end
     end
 
+    def states(arg = nil)
+      if !arg.nil?
+        @states = arg
+      else
+        @states
+      end
+    end
+
+    def authority(arg=nil)
+      if arg != nil
+        @authority = arg
+      else
+      @authority
+      end
+    end
+
+    def active(arg = nil)
+      if !arg.nil?
+        @active = arg
+      else
+        @active
+      end
+    end
+
+    def blocked(arg = nil)
+      if !arg.nil?
+        @blocked = arg
+      else
+        @blocked
+      end
+    end
+
+    def staged(arg = nil)
+      if !arg.nil?
+        @staged = arg
+      else
+        @staged
+      end
+    end
+
+    def approval(arg = nil)
+      if !arg.nil?
+        @approval = arg
+      else
+        @approval
+      end
+    end
+
+    def approved(arg = nil)
+      if !arg.nil?
+        @approved = arg
+      else
+        @approved
+      end
+    end
+
+    def approved_by_id(arg = nil)
+      if !arg.nil?
+        @approved_by_id = arg
+      else
+        @approved_by_id
+      end
+    end
+
+    def approved_at(arg = nil)
+      if !arg.nil?
+        @approved_at = arg
+      else
+        @approved_at
+      end
+    end
+
+    def suspend(arg = nil)
+      if !arg.nil?
+        @suspend = arg
+      else
+        @suspend
+      end
+    end
+
+    def suspended(arg = nil)
+      if !arg.nil?
+        @suspended = arg
+      else
+        @suspended
+      end
+    end
+
+    def suspended_at(arg = nil)
+      if !arg.nil?
+        @suspended_at = arg
+      else
+        @suspended_at
+      end
+    end
+
+    def suspended_till(arg = nil)
+      if !arg.nil?
+        @suspended_till = arg
+      else
+        @suspended_till
+      end
+    end
+
+    def registration_ip_address(arg = nil)
+      if !arg.nil?
+        @registration_ip_address = arg
+      else
+        @registration_ip_address
+      end
+    end
+
+    def dates(arg = nil)
+      if !arg.nil?
+        @dates = arg
+      else
+        @dates
+      end
+    end
+
+    def last_posted_at(arg = nil)
+      if !arg.nil?
+        @last_posted_at = arg
+      else
+        @last_posted_at
+      end
+    end
+
+    def last_emailed_at(arg = nil)
+      if !arg.nil?
+        @last_emailed_at = arg
+      else
+        @last_emailed_at
+      end
+    end
+
+    def previous_visit_at(arg = nil)
+      if !arg.nil?
+        @previous_visit_at = arg
+      else
+        @previous_visit_at
+      end
+    end
+
+    def first_seen_at(arg = nil)
+      if !arg.nil?
+        @first_seen_at = arg
+      else
+        @first_seen_at
+      end
+    end
 
     def created_at(arg=nil)
       if arg != nil
@@ -144,14 +304,14 @@ module Megam
       index_hash["id"] = id
       index_hash["email"] = email
       index_hash["api_key"] = api_key
-      index_hash["first_name"] = first_name
-      index_hash["last_name"] = last_name
+      index_hash["name"] = name
       index_hash["phone"] = phone
       index_hash["password"] = password
-      index_hash["password_reset_key"] = password_reset_key
-      index_hash["password_reset_sent_at"] = password_reset_sent_at
-      index_hash["authority"] = authority
-      index_hash["created_at"] = created_at
+      index_hash["states"] = states
+      index_hash["approval"] = approval
+      index_hash["suspend"] = suspend
+      index_hash["registration_ip_address"] = registration_ip_address
+      index_hash["dates"] = dates
       index_hash["some_msg"] = some_msg
       index_hash
     end
@@ -167,14 +327,13 @@ module Megam
         "id" => id,
         "email" => email,
         "api_key" => api_key,
-        "first_name" => first_name,
-        "last_name" => last_name,
+        "name" => name,
         "phone" => phone,
         "password" => password,
-        "password_reset_key" => password_reset_key,
-        "password_reset_sent_at" => password_reset_sent_at,
-        "authority" => authority,
-        "created_at" => created_at
+        "states" => states,
+        "approval" => approval,
+        "registration_ip_address" => registration_ip_address,
+        "dates" => dates
       }
       result
     end
@@ -185,14 +344,36 @@ module Megam
       acct.id(o["id"]) if o.has_key?("id")
       acct.email(o["email"]) if o.has_key?("email")
       acct.api_key(o["api_key"]) if o.has_key?("api_key")
-      acct.authority(o["authority"]) if o.has_key?("authority")
-      acct.first_name(o["first_name"]) if o.has_key?("first_name")
-      acct.last_name(o["last_name"]) if o.has_key?("last_name")
-      acct.phone(o["phone"]) if o.has_key?("phone")
-      acct.password(o["password"]) if o.has_key?("password")
-      acct.password_reset_key(o["password_reset_key"]) if o.has_key?("password_reset_key")
-      acct.password_reset_key(o["password_reset_sent_at"]) if o.has_key?("password_reset_sent_at")
-      acct.created_at(o["created_at"]) if o.has_key?("created_at")
+      na = o['name']
+      acct.name[:first_name] = na['first_name'] if na && na.key?('first_name')
+      acct.name[:last_name] = na['last_name'] if na && na.key?('last_name')
+      ph = o['phone']
+      acct.phone[:phone] = ph['phone'] if ph && ph.key?('phone')
+      acct.phone[:phone_verified] = ph['phone_verified'] if ph && ph.key?('phone_verified')
+      pwd = o['password']
+      acct.password[:password] = pwd['password'] if pwd && pwd.key?('password')
+      acct.password[:password_reset_key] = pwd['password_reset_key'] if pwd && pwd.key?('password_reset_key')
+      acct.password[:password_reset_sent_at] = pwd['password_reset_sent_at'] if pwd && pwd.key?('password_reset_sent_at')
+      st = o['states']
+      acct.states[:authority] = st['authority'] if st && st.key?('authority')
+      acct.states[:active] = st['active'] if st && st.key?('active')
+      acct.states[:blocked] = st['blocked'] if st && st.key?('blocked')
+      acct.states[:staged] = st['staged'] if st && st.key?('staged')
+      al = o['approval']
+      acct.approval[:approved] = al['approved'] if al && al.key?('approved')
+      acct.approval[:approved_by_id] = al['approved_by_id'] if al && al.key?('approved_by_id')
+      acct.approval[:approved_at] = al['approved_at'] if al && al.key?('approved_at')
+      sp = o['suspend']
+      acct.suspend[:suspended] = sp['suspended'] if sp && sp.key?('suspended')
+      acct.suspend[:suspended_at] = sp['suspended_at'] if sp && sp.key?('suspended_at')
+      acct.suspend[:suspended_till] = sp['suspended_till'] if sp && sp.key?('suspended_till')
+      acct.registration_ip_address(o["registration_ip_address"]) if o.has_key?("registration_ip_address")
+      dt = o['dates']
+      acct.dates[:last_posted_at] = dt['last_posted_at'] if dt && dt.key?('last_posted_at')
+      acct.dates[:last_emailed_at] = dt['last_emailed_at'] if dt && dt.key?('last_emailed_at')
+      acct.dates[:previous_visit_at] = dt['previous_visit_at'] if dt && dt.key?('previous_visit_at')
+      acct.dates[:first_seen_at] = dt['first_seen_at'] if dt && dt.key?('first_seen_at')
+      acct.dates[:created_at] = dt['created_at'] if dt && dt.key?('created_at')
       acct.some_msg[:code] = o["code"] if o.has_key?("code")
       acct.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
       acct.some_msg[:msg]= o["msg"] if o.has_key?("msg")
@@ -210,14 +391,14 @@ module Megam
       @id         = o[:id] if o.has_key?(:id)
       @email      = o[:email] if o.has_key?(:email)
       @api_key    = o[:api_key] if o.has_key?(:api_key)
-      @authority  = o[:authority] if o.has_key?(:authority)
-      @first_name = o[:first_name] if o.has_key?(:first_name)
-      @last_name  = o[:last_name] if o.has_key?(:last_name)
+      @name       = o[:name] if o.has_key?(:name)
       @phone      = o[:phone] if o.has_key?(:phone)
       @password   = o[:password] if o.has_key?(:password)
-      @password_reset_key = o[:password_reset_key] if o.has_key?(:password_reset_key)
-      @password_reset_sent_at = o[:password_reset_sent_at] if o.has_key?(:password_reset_sent_at)
-      @created_at = o[:created_at] if o.has_key?(:created_at)
+      @states     = o[:states] if o.has_key?(:states)
+      @approval   = o[:approval] if o.has_key?(:approval)
+      @suspend    = o[:suspend] if o.has_key?(:suspend)
+      @registration_ip_address = o[:registration_ip_address] if o.has_key?(:registration_ip_address)
+      @dates     = o[:dates] if o.has_key?(:dates)
       self
     end
 
@@ -241,12 +422,12 @@ module Megam
      acct = from_hash(o)
      acct.update
    end
-   
+
    def self.reset(o)
      acct = from_hash(o)
      acct.reset
    end
-   
+
    def self.repassword(o)
      acct = from_hash(o)
      acct.repassword
@@ -256,11 +437,11 @@ module Megam
    def update
      megam_rest.update_accounts(to_hash)
    end
-   
+
     def reset
      megam_rest.reset_accounts(to_hash)
    end
-   
+
    def repassword
      megam_rest.repassword_accounts(to_hash)
    end